Merge branch 'develop3.0' into feat/studentManage

TEAMModelOS/ClientApp/src/view/schoolmgmt/SystemSetting/SystemSetting.vue

@@ -80,7 +80,7 @@
                                                 <span class="time-inner-dot" :style="{backgroundColor: timeLineColor(index).color}"></span>
                                                 <span class="time-line-tail"></span>
                                             </span>
-                                            <div v-show="timeLineColor(index).color != '#606060'">
+                                            <div v-show="timeLineColor(index).showArrow">
                                                 <Icon class="first-arrow" size="20" :style="{color: timeLineColor(index).color}" type="ios-arrow-back" />
                                                 <Icon class="second-arrow" size="20" :style="{color: timeLineColor(index).color}" type="ios-arrow-back" />
                                             </div>
@@ -239,28 +239,39 @@
                         }
                     }
                 }
+                let curMonth = this.schoolSetting.period[this.curPriodIndex].semesters[this.curSemIndex].month
+                let nextMonth = -1
+                if (this.curSemIndex == len - 1) {
+                    nextMonth = this.schoolSetting.period[this.curPriodIndex].semesters[0].month
+                } else {
+                    nextMonth = this.schoolSetting.period[this.curPriodIndex].semesters[this.curSemIndex + 1].month
+                }
                 if (curIndex != -1) {
                     return {
                         color: this.colorList[curIndex],
-                        text: this.schoolSetting.period[this.curPriodIndex].semesters[curIndex].name
+                        text: this.schoolSetting.period[this.curPriodIndex].semesters[curIndex].name,
+                        showArrow: (index + 1) == curMonth || (index + 2) == nextMonth
                     }
                 } else if (this.curSemIndex == len - 1) {
                     if (this.schoolSetting.period[this.curPriodIndex].semesters[0].month > (index + 1) || this.schoolSetting.period[this.curPriodIndex].semesters[this.curSemIndex].month <= (index + 1)) {
                         curIndex = this.curSemIndex
                         return {
                             color: this.colorList[curIndex],
-                            text: this.schoolSetting.period[this.curPriodIndex].semesters[curIndex].name
+                            text: this.schoolSetting.period[this.curPriodIndex].semesters[curIndex].name,
+                            showArrow: (index + 1) == curMonth || (index + 2) == nextMonth
                         }
                     } else {
                         return {
                             color: '#606060',
-                            text: ''
+                            text: '',
+                            showArrow: (index + 1) == curMonth || (index + 2) == nextMonth
                         }
                     }
                 } else {
                     return {
                         color: '#606060',
-                        text: ''
+                        text: '',
+                        showArrow: (index + 1) == curMonth || (index + 2) == nextMonth
                     }
                 }
 

TEAMModelOS/Controllers/Client/HiTeachController.cs

@@ -134,7 +134,7 @@ namespace TEAMModelOS.Controllers.Client
                 }
                 //老師個人試題
                 List<object> items = new List<object>();
-                await foreach (var item in client.GetContainer("TEAMModelOSTemp", "Teacher").GetItemQueryStreamIterator(queryText: $"SELECT c.id, c.blob, c.type, c.points, c.field, c.subjectName, c.level, c.usageCount, c.scope from c ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Item-{id}") }))
+                await foreach (var item in client.GetContainer("TEAMModelOSTemp", "Teacher").GetItemQueryStreamIterator(queryText: $"SELECT c.id, c.blob, c.type, c.points, c.field, c.subjectName, c.level, c.useCount, c.createDate from c ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Item-{id}") }))
                 {
                     using var json = await JsonDocument.ParseAsync(item.ContentStream);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
@@ -147,7 +147,7 @@ namespace TEAMModelOS.Controllers.Client
                 }
                 //老師個人試券
                 List<object> papers = new List<object>();
-                await foreach (var item in client.GetContainer("TEAMModelOSTemp", "Teacher").GetItemQueryStreamIterator(queryText: $"SELECT c.id, c.name, c.blob, c.index, c.items, c.subjectName, c.score, c.scope from c ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Paper-{id}") }))
+                await foreach (var item in client.GetContainer("TEAMModelOSTemp", "Teacher").GetItemQueryStreamIterator(queryText: $"SELECT c.id, c.name, c.blob, c.subjectName, c.score, c.useCount, c.createDate from c ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Paper-{id}") }))
                 {
                     using var json = await JsonDocument.ParseAsync(item.ContentStream);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
@@ -322,7 +322,7 @@ namespace TEAMModelOS.Controllers.Client
 
             //校本試題
             List<object> items = new List<object>();
-            await foreach (var item in client.GetContainer("TEAMModelOSTemp", "School").GetItemQueryStreamIterator(queryText: $"SELECT c.id, c.blob, c.type, c.points, c.field, c.periodId, c.gradeIds, c.subjectId, c.level, c.usageCount, c.scope from c ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Item-{school_code}") }))
+            await foreach (var item in client.GetContainer("TEAMModelOSTemp", "School").GetItemQueryStreamIterator(queryText: $"SELECT c.id, c.blob, c.type, c.points, c.field, c.periodId, c.gradeIds, c.subjectId, c.level, c.useCount, c.createDate from c ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Item-{school_code}") }))
             {
                 using var json = await JsonDocument.ParseAsync(item.ContentStream);
                 if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
@@ -335,7 +335,7 @@ namespace TEAMModelOS.Controllers.Client
             }
             //校本試券
             List<object> papers = new List<object>();
-            await foreach (var item in client.GetContainer("TEAMModelOSTemp", "School").GetItemQueryStreamIterator(queryText: $"SELECT c.id, c.name, c.blob, c.index, c.items, c.periodId, c.gradeIds, c.subjectId, c.score, c.level, c.useCount, c.scope from c ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Paper-{school_code}") }))
+            await foreach (var item in client.GetContainer("TEAMModelOSTemp", "School").GetItemQueryStreamIterator(queryText: $"SELECT c.id, c.name, c.blob, c.periodId, c.gradeIds, c.subjectId, c.score, c.useCount, c.createDate from c ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Paper-{school_code}") }))
             {
                 using var json = await JsonDocument.ParseAsync(item.ContentStream);
                 if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)