Merge branch 'master' of http://git.fmode.cn:3000/bin/edu-textbook

projects/textbook/src/app/textbook/textbook.component.ts

@@ -104,8 +104,8 @@ export class TextbookComponent implements OnInit {
     approval: {
       listOfFilter: [
         {
-          value: '经中央有关部门审定的教材',
-          text: '经中央有关部门审定的教材',
+          value: '经中央有关部门审定的教材（已点对点通知）',
+          text: '经中央有关部门审定的教材（已点对点通知）',
         },
         {
           value: '首届全国教材建设奖优秀教材（高等教育类）教材',
@@ -903,7 +903,7 @@ export class TextbookComponent implements OnInit {
         _body += '</td>';
 
         _body += '<td>';
-        _body += `${data[row].get('code') || ''}`;
+        _body += `&nbsp;${data[row].get('code') || ''}`;
         _body += '</td>';
 
         _body += '<td>';
@@ -935,7 +935,7 @@ export class TextbookComponent implements OnInit {
         _body += '</td>';
 
         _body += '<td>';
-        _body += `${
+        _body += `&nbsp;${
           this.fromatFiled(data[row]?.get('childrens'), 'editionFirst')
         }`;
         _body += '</td>';

server/db/index.js

@@ -8,6 +8,8 @@ import {_Session} from "./schemas/_Session"
 import {Submitted} from "./schemas/Submitted"
 import {EduProcess} from "./schemas/EduProcess"
 import { Department } from "./schemas/Department"
+import { Review } from "./schemas/Review"
+import { Activity } from "./schemas/Activity"
 export const EduSchemas = [
     _User,
     _Role,
@@ -18,6 +20,8 @@ export const EduSchemas = [
     EduCollection,
     Submitted,
     EduProcess,
-    Department
+    Department,
+    Review,
+    Activity
 ]
 module.exports.EduSchemas = EduSchemas

server/db/schemas/Activity.js

@@ -0,0 +1,58 @@
+/* 评审表 */
+export const Activity = {
+  "className": "Activity",
+  "fields": {
+    "name":{//活动名称
+      "type": "String",
+      "required": false
+    },
+    "eduProcess": { //评审教材
+      "type": "Pointer",
+      "targetClass": "EduProcess",
+      "required": false
+    },
+    "startDate": {//开始时间
+      "type": "Date",
+      "required": false
+    },
+    "deadline": {//截止时间
+      "type": "Date",
+      "required": false
+    },
+    "status":{//是否开始
+      "type": "Number",
+      "required": false
+    },
+    "desc":{//详情说明
+      "type": "String",
+      "required": false
+    },
+  },
+  "classLevelPermissions": {
+    "find": {
+      "*": true
+    },
+    "get": {
+      "*": true
+    },
+    "count": {
+      "*": true
+    },
+    "create": {
+      "*": true
+    },
+    "update": {
+      "*": true
+    },
+    "delete": {
+      "*": true
+    },
+    "addField": {
+      "*": true
+    },
+    "protectedFields": {
+      "*": []
+    }
+  }
+}
+module.exports.Activity = Activity

server/db/schemas/Review.js

@@ -0,0 +1,57 @@
+/* 评审表 */
+export const Review = {
+  "className": "Review",
+  "fields": {
+    "eduTextbook": { //评审教材
+      "type": "Pointer",
+      "targetClass": "EduTextbook",
+      "required": false
+    },
+    "user": {
+      "type": "Pointer",
+      "targetClass": "_User",
+      "required": false
+    },
+    "profile": { //评审用户
+      "type": "Pointer",
+      "targetClass": "Profile",
+      "required": false
+    },
+    "score": {//最终分数
+      "type": "Number"
+    },
+    "expect":{//预估分
+      "type": "Number"
+    },
+    "verify":{
+      "type": "Boolean"
+    }
+  },
+  "classLevelPermissions": {
+    "find": {
+      "*": true
+    },
+    "get": {
+      "*": true
+    },
+    "count": {
+      "*": true
+    },
+    "create": {
+      "*": true
+    },
+    "update": {
+      "*": true
+    },
+    "delete": {
+      "*": true
+    },
+    "addField": {
+      "*": true
+    },
+    "protectedFields": {
+      "*": []
+    }
+  }
+}
+module.exports.Review = Review