Selaa lähdekoodia

elective - allMatched rename to allEnrolled

hare8999@163.com 2 vuotta sitten
vanhempi
commit
00f5d94f62

+ 2 - 2
doc/Mind/ElectiveGeneration.cs

@@ -89,11 +89,11 @@ namespace mxdemo.Mind
 
     public class RoundForFlow : mxdemo.Mind.IStudentClassDispatchService.Round // Round到时候合并在一起
     {
-        bool allMatched; // 所有学生录取完毕,可以开始推进排名均衡或者分班
+        bool allEnrolled; // 所有学生录取完毕,可以开始推进排名均衡或者分班
         EnumElectiveGeneration currentGeneration; // 内部字段
 
         // + new fields
-        // int disenrollCount; // 未录取学生数量 - 用于图表展示,或者内部判定allMatched // 5.22 将此字段改到summary才能体现不同代的未录人数
+        // int disenrollCount; // 未录取学生数量 - 用于图表展示,或者内部判定allEnrolled // 5.22 将此字段改到summary才能体现不同代的未录人数
         bool enablePushNextDMGeneration; // 是否可以强制推进下一代决策进程 = 当前为报名进程,且学生均已报名
         bool allowDMAlgorithm; // 当前为决策进程,支持运行匹配算法(BackTrackingDM,FinalAdjustDM)
         bool doneDMAlgorithm; // 当前为决策进程,且已经运行了匹配算法

+ 1 - 1
mock/modules/elective-generation.js

@@ -27,7 +27,7 @@ module.exports = [
             limitPerson: false,
             rankOut: false
           })),
-          allMatched: true,
+          allEnrolled: true,
           currentGeneration: mockGeneration,
 
           // +

+ 1 - 1
public/mock/electiveStatus.json

@@ -47,7 +47,7 @@
       "personCount": 250
     }
   ],
-  "allMatched": true,
+  "allEnrolled": true,
   "currentGeneration": 7,
   "disenrollCount": 0,
   "enablePushNextDMGeneration": true,

+ 3 - 3
src/views/elective/generation/components/elective-generation-commands.vue

@@ -73,16 +73,16 @@ export default {
       return this.status.enablePushForceAdjust
     },
     showSend() {
-      return this.status.doneDMAlgorithm && !this.status.allMatched
+      return this.status.doneDMAlgorithm && !this.status.allEnrolled
     },
     showRankBalance() {
       return false // TODO: not implement.
       const options = this.generation.options
-      return this.status.allMatched && this.generation.current < options.rankBalance.value
+      return this.status.allEnrolled && this.generation.current < options.rankBalance.value
     },
     showClassDispatch() {
       const options = this.generation.options
-      return this.status.allMatched && this.generation.current <= options.rankBalance.value
+      return this.status.allEnrolled && this.generation.current <= options.rankBalance.value
     }
   },
   data() {