add other duty time display with mock

doc/api.md

@@ -36,7 +36,7 @@
 
 ### 值班信息 `GET /duty/info`
 
-#### 当前在值班
+#### 当前在值班（正常值班时间）
 
 data:
 
@@ -45,7 +45,22 @@ data:
   "isInDuty": true,
   "inDutyCnt": 3,
   "currentDuty": "2",
-  "place": "东三-204"
+  "place": "东三-204",
+  "otherDutyTime": ""
+}
+```
+
+#### 当前在值班（其他值班时间）
+
+data:
+
+```json
+{
+  "isInDuty": true,
+  "inDutyCnt": 3,
+  "currentDuty": "others",
+  "place": "蓝田",
+  "otherDutyTime": "9:30-11:30"
 }
 ```
 

mock/api.ts

@@ -9,8 +9,9 @@ export default {
       token: 'token_test',
       isInDuty: true,
       inDutyCnt: 3,
-      currentDuty: '2',
-      place: '204',
+      currentDuty: 'others',
+      otherDutyTime: '9:30-11:30',
+      place: '蓝田',
     },
   },
   'GET /user/info': {

src/pages/index/DutyInfo.tsx

@@ -12,6 +12,7 @@ export class DutyData {
     this.isInDuty = false;
     this.inDutyCnt = 3;
     this.currentDuty = '2';
+    this.otherDutyTime = '9:30-11:30';
     this.offDutyReason = '学园维修';
     this.dutyRecoverTime = '下周一';
     this.place = '东三-204';
@@ -20,6 +21,7 @@ export class DutyData {
   isInDuty: boolean;
   inDutyCnt?: number;
   currentDuty?: 'off' | '1' | '2' | '3' | 'others';
+  otherDutyTime?: string;
   offDutyReason?: string;
   dutyRecoverTime?: string;
   place: string;
@@ -101,7 +103,12 @@ export class DutyInfo extends Component {
         <Card isInDuty={data.isInDuty} place={data.place} />
         <AtTimeline
           items={[
-            { title: id.currentDutyText(data.currentDuty || 'off') },
+            {
+              title:
+                data.currentDuty == 'others'
+                  ? id.currentDutyText('others') + data.otherDutyTime
+                  : id.currentDutyText(data.currentDuty || 'off'),
+            },
             { title: id.inDutyCnt(data.inDutyCnt as number) },
           ]}
         />

src/plain-text/MainPage.ts

@@ -90,7 +90,7 @@ export const mainPageZhCn: MainPageText = {
           case '3':
             return '第三班 18:00-20:30';
           case 'others':
-            return '其他值班时间，见通知';
+            return '当班 ';
         }
       },
       inDutyCnt: (n) => '当前值班人数：' + n,
@@ -151,7 +151,7 @@ export const mainPageEnUs: MainPageText = {
           case '3':
             return '3rd Shift 18:00-20:30';
           case 'others':
-            return 'Other duty time, see notice';
+            return 'Current Shift ';
         }
       },
       inDutyCnt: (n) => 'EVA members on duty: ' + n,

src/service/dutyInfo.ts

@@ -27,6 +27,7 @@ export function getDutyInfo(that: MainPage) {
             isInDuty: data.isInDuty,
             inDutyCnt: data.inDutyCnt,
             currentDuty: data.currentDuty,
+            otherDutyTime: data.otherDutyTime,
             place: data.place,
           },
         });