Merge

Author: Peng-YM

src/courses/courses.js

@@ -21,6 +21,7 @@ import {
     ChipField,
     EmailField,
     DateField,
+    UrlField
 } from 'react-admin';
 import {
     DateInput
@@ -30,6 +31,7 @@ import RichTextInput from 'ra-input-rich-text';
 import BookIcon from '@material-ui/icons/Book';
 import ResourcesManager from './resourcesManager';
 import ExamsManager from './examsManager';
+import {SizeField} from '../resources/resources';
 
 export const CourseIcon = BookIcon;
 
@@ -97,9 +99,10 @@ export const CourseShow = props => (
             <Tab label="resources">
                 <ReferenceManyField addLabel={false} reference="resources" target="courses">
                     <Datagrid>
-                        <TextField source="id"/>
-                        <TextField source="name"/>
-                        <TextField source="link"/>
+                        <TextField source="name" />
+                        <UrlField source="url" />
+                        <TextField source="fileType"/>
+                        <SizeField source="size"/>
                     </Datagrid>
                 </ReferenceManyField>
             </Tab>

src/courses/examsManager.js

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import {getList, getManyReference, isIdExists, setManyReference} from '../utils/api';
+import {getList, getManyReference, isIdExists, setOneReference, deleteOneReference} from '../utils/api';
 import Checkbox from '@material-ui/core/Checkbox';
 
 
@@ -246,7 +246,6 @@ class ExamsManager extends Component{
     render(){
         const classes = this.props;
         const { exams, order, orderBy, page, rowsPerPage, selected } = this.state;
-        console.log(exams);
         const emptyRows = rowsPerPage - Math.min(rowsPerPage, exams.length - page * rowsPerPage);
         return (
             <Paper className={classes.root}>
@@ -283,11 +282,13 @@ class ExamsManager extends Component{
                                     let index = isIdExists(selected, exam.id);
                                     if (index === -1) {
                                         selected.push(exam);
-                                        this.setState({selected: selected}, this.submit);
+                                        this.add(exam);
+                                        this.setState({selected: selected});
                                     }
                                     else if (index !== -1) {
                                         selected.splice(index, 1);
-                                        this.setState({selected: selected}, this.submit);
+                                        this.delete(exam);
+                                        this.setState({selected: selected});
                                     }
                                 }
                             }
@@ -326,8 +327,12 @@ class ExamsManager extends Component{
         );
     }
 
-    submit(){
-        setManyReference("exams", this.course, this.state.selected);
+    add(exam){
+      setOneReference("course", exam, this.course);
+    }
+
+    delete(exam){
+      deleteOneReference("course", exam, this.course);
     }
 }
 

src/courses/resourcesManager.js

@@ -41,7 +41,7 @@ function getSorting(order, orderBy) {
 const columnData = [
     { id: 'File Name', numeric: false, disablePadding: false, label: 'File Name' },
     { id: 'File Type', numeric: false, disablePadding: false, label: 'File Type' },
-    { id: 'Size', numeric: false, disablePadding: false, label: 'Size'},
+    { id: 'Size', numeric: false, disablePadding: false, label: 'Size(M)'},
     { id: 'Preview', numeric: false, disablePadding: false, label: 'Preview' },
 ];
 
@@ -244,7 +244,7 @@ class ResourcesManager extends Component{
                         <TableRow key={file.name}>
                         <TableCell numeric={false}>{file.name}</TableCell>
                         <TableCell numeric={false}>{file.type}</TableCell>
-                        <TableCell numeric={false}>{file.size}</TableCell>
+                        <TableCell numeric={false}>{(file.size/1024/1024).toFixed(2)}</TableCell>
                         <TableCell numeric={false}><a href={file.preview}>Preview</a></TableCell>
                         </TableRow>
                     );

src/roles/roles.js

@@ -56,7 +56,7 @@ export const UserEdit = props => (
     <Edit title={<UserTitle/>} {...props}>
         <SimpleForm>
             <ImageField source = "avatar" label="Avatar"/>
-            <TextField source="id" />
+            <TextInput source="avatar" />
             <DisabledInput source="id"/>
             <EmailField source="email"/>
             <TextInput source="firstName" validate={required()}/>
@@ -103,9 +103,6 @@ export const UserShow = props => (
                     </Datagrid>   
                 </ReferenceManyField>
             </Tab>
-            <Tab label="marks">
-                
-            </Tab>
         </TabbedShowLayout>
     </Show>
 );

src/users/users.js

@@ -87,7 +87,7 @@ export function isIdExists(list, id){
 export function uploadCourseFiles(course, files){
     const formData = new FormData();
     _.each(files, file => formData.append("files", file));
-    return axios.post('uploadMultiples', formData, {
+    return axios.post('upload', formData, {
         withCredentials: true,
         headers: {
             'Content-Type': 'multipart/form-data',