|
@@ -115,10 +115,18 @@ Ext.define('school.view.interaction.timetable.Detail', {
|
|
|
let now = new Date();
|
|
let now = new Date();
|
|
|
let year = now.getFullYear();
|
|
let year = now.getFullYear();
|
|
|
let month = now.getMonth() + 1;
|
|
let month = now.getMonth() + 1;
|
|
|
- let o1, o2;
|
|
|
|
|
|
|
+ let o1, o2, termPart;
|
|
|
|
|
+
|
|
|
o1 = [(year - 1) + '-' + year];
|
|
o1 = [(year - 1) + '-' + year];
|
|
|
o2 = [year + '-' + (year + 1)];
|
|
o2 = [year + '-' + (year + 1)];
|
|
|
- return (month < 9) ? o1[0] : o2[0]
|
|
|
|
|
|
|
+
|
|
|
|
|
+ if((month > 2 && month < 8) || (month == 2 && date > 15) || (month == 8 && date < 15)) {
|
|
|
|
|
+ termPart = o1[0];
|
|
|
|
|
+ }else {
|
|
|
|
|
+ termPart = o2[0];
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ return termPart;
|
|
|
})()
|
|
})()
|
|
|
}, {
|
|
}, {
|
|
|
xtype: "combobox",
|
|
xtype: "combobox",
|