Skip to content

Commit 35b723b

Browse files
fanglinfangfanglinfang
authored
Merge pull request #2908 from uw-it-aca/qa
Fix/muwm 5230 (#2905)
2 parents 85c7906 + cde9584 commit 35b723b

File tree

7 files changed

+208
-151
lines changed

7 files changed

+208
-151
lines changed

‎docker/prod-values.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
autoscaling:
22
enabled: true
3-
minReplicas: 3
3+
minReplicas: 8
44
maxReplicas: 80
55
targetAverageUtilization: 100
66
resources:

‎myuw/resources/calendar/file/calendars/sea_acad-inst.ics

+29-9
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ DTSTART;VALUE=DATE:20101208
1212
DTEND;VALUE=DATE:20101213
1313
X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
1414
X-TRUMBA-CUSTOMFIELD;NAME="Event Type";ID=21;TYPE=number:Important Dates/Deadlines
15+
X-TRUMBA-CUSTOMFIELD;NAME="Event interval";ID=30051;TYPE=CustomAsset:Ongoing event
1516
X-TRUMBA-CUSTOMFIELD;NAME="Year";ID=30147;TYPE=CustomAsset:2010
1617
X-TRUMBA-CUSTOMFIELD;NAME="Quarter";ID=30148;TYPE=CustomAsset:Autumn
1718
DTSTAMP:20100121T144110Z
@@ -21,11 +22,12 @@ UID:http://uid.trumba.com/event/108206457
2122
END:VEVENT
2223

2324
BEGIN:VEVENT
24-
SUMMARY:*Winter break
25+
SUMMARY:Quarter Break - Winter
2526
DTSTART;VALUE=DATE:20101213
2627
DTEND;VALUE=DATE:20110105
2728
X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
2829
X-TRUMBA-CUSTOMFIELD;NAME="Event Type";ID=21;TYPE=number:Important Dates/Deadlines
30+
X-TRUMBA-CUSTOMFIELD;NAME="Event interval";ID=30051;TYPE=CustomAsset:Ongoing event
2931
X-TRUMBA-CUSTOMFIELD;NAME="Year";ID=30147;TYPE=CustomAsset:2011
3032
X-TRUMBA-CUSTOMFIELD;NAME="Quarter";ID=30148;TYPE=CustomAsset:Winter
3133
DTSTAMP:20131122T091819Z
@@ -40,6 +42,7 @@ DTSTART;VALUE=DATE:20110105
4042
DTEND;VALUE=DATE:20110106
4143
X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
4244
X-TRUMBA-CUSTOMFIELD;NAME="Event Type";ID=21;TYPE=number:Important Dates/Deadlines
45+
X-TRUMBA-CUSTOMFIELD;NAME="Event interval";ID=30051;TYPE=CustomAsset:Single day event
4346
X-TRUMBA-CUSTOMFIELD;NAME="Year";ID=30147;TYPE=CustomAsset:2011
4447
X-TRUMBA-CUSTOMFIELD;NAME="Quarter";ID=30148;TYPE=CustomAsset:Winter
4548
DTSTAMP:20131118T114154Z
@@ -54,6 +57,7 @@ DTSTART;VALUE=DATE:20110313
5457
DTEND;VALUE=DATE:20110314
5558
X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
5659
X-TRUMBA-CUSTOMFIELD;NAME="Event Type";ID=21;TYPE=number:Important Dates/Deadlines
60+
X-TRUMBA-CUSTOMFIELD;NAME="Event interval";ID=30051;TYPE=CustomAsset:Single day event
5761
X-TRUMBA-CUSTOMFIELD;NAME="Year";ID=30147;TYPE=CustomAsset:2011
5862
X-TRUMBA-CUSTOMFIELD;NAME="Quarter";ID=30148;TYPE=CustomAsset:Winter
5963
DTSTAMP:20100121T144110Z
@@ -68,6 +72,7 @@ DTSTART;VALUE=DATE:20110313
6872
DTEND;VALUE=DATE:20110314
6973
X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
7074
X-TRUMBA-CUSTOMFIELD;NAME="Event Type";ID=21;TYPE=number:Important Dates/Deadlines
75+
X-TRUMBA-CUSTOMFIELD;NAME="Event interval";ID=30051;TYPE=CustomAsset:Single day event
7176
X-TRUMBA-CUSTOMFIELD;NAME="Year";ID=30147;TYPE=CustomAsset:2011
7277
X-TRUMBA-CUSTOMFIELD;NAME="Quarter";ID=30148;TYPE=CustomAsset:Winter
7378
DTSTAMP:20131118T114239Z
@@ -82,6 +87,7 @@ DTSTART;VALUE=DATE:20110316
8287
DTEND;VALUE=DATE:20110321
8388
X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
8489
X-TRUMBA-CUSTOMFIELD;NAME="Event Type";ID=21;TYPE=number:Important Dates/Deadlines
90+
X-TRUMBA-CUSTOMFIELD;NAME="Event interval";ID=30051;TYPE=CustomAsset:Ongoing event
8591
X-TRUMBA-CUSTOMFIELD;NAME="Year";ID=30147;TYPE=CustomAsset:2011
8692
X-TRUMBA-CUSTOMFIELD;NAME="Quarter";ID=30148;TYPE=CustomAsset:Winter
8793
DTSTAMP:20100121T144110Z
@@ -91,11 +97,12 @@ UID:http://uid.trumba.com/event/108206510
9197
END:VEVENT
9298

9399
BEGIN:VEVENT
94-
SUMMARY:*Spring break
100+
SUMMARY:Quarter Break - Spring
95101
DTSTART;VALUE=DATE:20110321
96102
DTEND;VALUE=DATE:20110330
97103
X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
98104
X-TRUMBA-CUSTOMFIELD;NAME="Event Type";ID=21;TYPE=number:Important Dates/Deadlines
105+
X-TRUMBA-CUSTOMFIELD;NAME="Event interval";ID=30051;TYPE=CustomAsset:Ongoing event
99106
X-TRUMBA-CUSTOMFIELD;NAME="Year";ID=30147;TYPE=CustomAsset:2011
100107
X-TRUMBA-CUSTOMFIELD;NAME="Quarter";ID=30148;TYPE=CustomAsset:Winter
101108
DTSTAMP:20131122T091718Z
@@ -110,6 +117,7 @@ DTSTART;VALUE=DATE:20110330
110117
DTEND;VALUE=DATE:20110331
111118
X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
112119
X-TRUMBA-CUSTOMFIELD;NAME="Event Type";ID=21;TYPE=number:Important Dates/Deadlines
120+
X-TRUMBA-CUSTOMFIELD;NAME="Event interval";ID=30051;TYPE=CustomAsset:Single day event
113121
X-TRUMBA-CUSTOMFIELD;NAME="Year";ID=30147;TYPE=CustomAsset:2011
114122
X-TRUMBA-CUSTOMFIELD;NAME="Quarter";ID=30148;TYPE=CustomAsset:Spring
115123
DTSTAMP:20131206T101038Z
@@ -124,6 +132,7 @@ DTSTART;VALUE=DATE:20110605
124132
DTEND;VALUE=DATE:20110606
125133
X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
126134
X-TRUMBA-CUSTOMFIELD;NAME="Event Type";ID=21;TYPE=number:Important Dates/Deadlines
135+
X-TRUMBA-CUSTOMFIELD;NAME="Event interval";ID=30051;TYPE=CustomAsset:Single day event
127136
X-TRUMBA-CUSTOMFIELD;NAME="Year";ID=30147;TYPE=CustomAsset:2011
128137
X-TRUMBA-CUSTOMFIELD;NAME="Quarter";ID=30148;TYPE=CustomAsset:Spring
129138
DTSTAMP:20131122T085800Z
@@ -138,6 +147,7 @@ DTSTART;VALUE=DATE:20110606
138147
DTEND;VALUE=DATE:20110613
139148
X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
140149
X-TRUMBA-CUSTOMFIELD;NAME="Event Type";ID=21;TYPE=number:Important Dates/Deadlines
150+
X-TRUMBA-CUSTOMFIELD;NAME="Event interval";ID=30051;TYPE=CustomAsset:Ongoing event
141151
X-TRUMBA-CUSTOMFIELD;NAME="Year";ID=30147;TYPE=CustomAsset:2011
142152
X-TRUMBA-CUSTOMFIELD;NAME="Quarter";ID=30148;TYPE=CustomAsset:Spring
143153
DTSTAMP:20131211T104940Z
@@ -147,11 +157,12 @@ UID:http://uid.trumba.com/event/108067601
147157
END:VEVENT
148158

149159
BEGIN:VEVENT
150-
SUMMARY:*Summer break
160+
SUMMARY:Quarter Break - Summer
151161
DTSTART;VALUE=DATE:20110613
152162
DTEND;VALUE=DATE:20110622
153163
X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
154164
X-TRUMBA-CUSTOMFIELD;NAME="Event Type";ID=21;TYPE=number:Important Dates/Deadlines
165+
X-TRUMBA-CUSTOMFIELD;NAME="Event interval";ID=30051;TYPE=CustomAsset:Ongoing event
155166
X-TRUMBA-CUSTOMFIELD;NAME="Year";ID=30147;TYPE=CustomAsset:2011
156167
X-TRUMBA-CUSTOMFIELD;NAME="Quarter";ID=30148;TYPE=CustomAsset:Summer
157168
DTSTAMP:20100121T144002Z
@@ -166,6 +177,7 @@ DTSTART;VALUE=DATE:20110622
166177
DTEND;VALUE=DATE:20110623
167178
X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
168179
X-TRUMBA-CUSTOMFIELD;NAME="Event Type";ID=21;TYPE=number:Important Dates/Deadlines
180+
X-TRUMBA-CUSTOMFIELD;NAME="Event interval";ID=30051;TYPE=CustomAsset:Single day event
169181
X-TRUMBA-CUSTOMFIELD;NAME="Year";ID=30147;TYPE=CustomAsset:2011
170182
X-TRUMBA-CUSTOMFIELD;NAME="Quarter";ID=30148;TYPE=CustomAsset:Summer
171183
DTSTAMP:20131122T092845Z
@@ -180,6 +192,7 @@ DTSTART;VALUE=DATE:20110722
180192
DTEND;VALUE=DATE:20110723
181193
X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
182194
X-TRUMBA-CUSTOMFIELD;NAME="Event Type";ID=21;TYPE=number:Important Dates/Deadlines
195+
X-TRUMBA-CUSTOMFIELD;NAME="Event interval";ID=30051;TYPE=CustomAsset:Single day event
183196
X-TRUMBA-CUSTOMFIELD;NAME="Year";ID=30147;TYPE=CustomAsset:2011
184197
X-TRUMBA-CUSTOMFIELD;NAME="Quarter";ID=30148;TYPE=CustomAsset:Summer
185198
DTSTAMP:20131122T094047Z
@@ -194,6 +207,7 @@ DTSTART;VALUE=DATE:20110722
194207
DTEND;VALUE=DATE:20110723
195208
X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
196209
X-TRUMBA-CUSTOMFIELD;NAME="Event Type";ID=21;TYPE=number:Important Dates/Deadlines
210+
X-TRUMBA-CUSTOMFIELD;NAME="Event interval";ID=30051;TYPE=CustomAsset:Single day event
197211
X-TRUMBA-CUSTOMFIELD;NAME="Year";ID=30147;TYPE=CustomAsset:2011
198212
X-TRUMBA-CUSTOMFIELD;NAME="Quarter";ID=30148;TYPE=CustomAsset:Summer
199213
DTSTAMP:20131122T093316Z
@@ -208,6 +222,7 @@ DTSTART;VALUE=DATE:20110723
208222
DTEND;VALUE=DATE:20110724
209223
X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
210224
X-TRUMBA-CUSTOMFIELD;NAME="Event Type";ID=21;TYPE=number:Important Dates/Deadlines
225+
X-TRUMBA-CUSTOMFIELD;NAME="Event interval";ID=30051;TYPE=CustomAsset:Single day event
211226
X-TRUMBA-CUSTOMFIELD;NAME="Year";ID=30147;TYPE=CustomAsset:2011
212227
X-TRUMBA-CUSTOMFIELD;NAME="Quarter";ID=30148;TYPE=CustomAsset:Summer
213228
DTSTAMP:20131122T092928Z
@@ -222,6 +237,7 @@ DTSTART;VALUE=DATE:20110821
222237
DTEND;VALUE=DATE:20110822
223238
X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
224239
X-TRUMBA-CUSTOMFIELD;NAME="Event Type";ID=21;TYPE=number:Important Dates/Deadlines
240+
X-TRUMBA-CUSTOMFIELD;NAME="Event interval";ID=30051;TYPE=CustomAsset:Single day event
225241
X-TRUMBA-CUSTOMFIELD;NAME="Year";ID=30147;TYPE=CustomAsset:2011
226242
X-TRUMBA-CUSTOMFIELD;NAME="Quarter";ID=30148;TYPE=CustomAsset:Summer
227243
DTSTAMP:20131122T094108Z
@@ -236,6 +252,7 @@ DTSTART;VALUE=DATE:20110821
236252
DTEND;VALUE=DATE:20110822
237253
X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
238254
X-TRUMBA-CUSTOMFIELD;NAME="Event Type";ID=21;TYPE=number:Important Dates/Deadlines
255+
X-TRUMBA-CUSTOMFIELD;NAME="Event interval";ID=30051;TYPE=CustomAsset:Single day event
239256
X-TRUMBA-CUSTOMFIELD;NAME="Year";ID=30147;TYPE=CustomAsset:2011
240257
X-TRUMBA-CUSTOMFIELD;NAME="Quarter";ID=30148;TYPE=CustomAsset:Summer
241258
DTSTAMP:20131122T093427Z
@@ -250,13 +267,16 @@ DTSTART;VALUE=DATE:20110821
250267
DTEND;VALUE=DATE:20110822
251268
X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
252269
X-TRUMBA-CUSTOMFIELD;NAME="Event Type";ID=21;TYPE=number:Important Dates/Deadlines
270+
X-TRUMBA-CUSTOMFIELD;NAME="Event interval";ID=30051;TYPE=CustomAsset:Single day event
271+
X-TRUMBA-CUSTOMFIELD;NAME="Year";ID=30147;TYPE=CustomAsset:2011
272+
X-TRUMBA-CUSTOMFIELD;NAME="Quarter";ID=30148;TYPE=CustomAsset:Summer
253273
DTSTAMP:20131122T093205Z
254274
CATEGORIES:Dates of Instruction
255275
UID:http://uid.trumba.com/event/108068008
256276
END:VEVENT
257277

258278
BEGIN:VEVENT
259-
SUMMARY:*Autumn break
279+
SUMMARY:Quarter Break - Autumn
260280
DTSTART;VALUE=DATE:20110822
261281
DTEND;VALUE=DATE:20110930
262282
X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@@ -859,7 +879,7 @@ UID:http://uid.trumba.com/event/108218190
859879
END:VEVENT
860880

861881
BEGIN:VEVENT
862-
SUMMARY:*Spring break
882+
SUMMARY:Quarter Break - Spring
863883
DTSTART;VALUE=DATE:20130321
864884
DTEND;VALUE=DATE:20130327
865885
X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@@ -873,7 +893,7 @@ UID:http://uid.trumba.com/event/108067803
873893
END:VEVENT
874894

875895
BEGIN:VEVENT
876-
SUMMARY:Summer Break
896+
SUMMARY:Quarter Break - Summer
877897
DTSTART;VALUE=DATE:20130613
878898
DTEND;VALUE=DATE:20130619
879899
X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@@ -887,7 +907,7 @@ UID:http://uid.trumba.com/event/108330602
887907
END:VEVENT
888908

889909
BEGIN:VEVENT
890-
SUMMARY:*Autumn break
910+
SUMMARY:Quarter Break - Autumn
891911
DTSTART;VALUE=DATE:20130822
892912
DTEND;VALUE=DATE:20130927
893913
X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@@ -901,7 +921,7 @@ UID:http://uid.trumba.com/event/108068529
901921
END:VEVENT
902922

903923
BEGIN:VEVENT
904-
SUMMARY:*Winter break
924+
SUMMARY:Quarter Break - Winter
905925
DTSTART;VALUE=DATE:20131213
906926
DTEND;VALUE=DATE:20140103
907927
X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@@ -915,7 +935,7 @@ UID:http://uid.trumba.com/event/108067796
915935
END:VEVENT
916936

917937
BEGIN:VEVENT
918-
SUMMARY:*Spring break
938+
SUMMARY:Quarter Break - Spring
919939
DTSTART;VALUE=DATE:20140321
920940
DTEND;VALUE=DATE:20140326
921941
X-MICROSOFT-CDO-ALLDAYEVENT:TRUE

‎myuw/test/api/test_academic_calendar.py

+9-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@ def test_all_events(self):
3333
data = json.loads(response.content)
3434
self.assertEquals(len(data), 28)
3535

36+
def test_MUWM_5230(self):
37+
self.set_user('javerage')
38+
response = self.get_cal()
39+
data = json.loads(response.content)
40+
for event in data:
41+
self.assertIsNotNone(event.get("quarter"))
42+
self.assertIsNotNone(event.get("year"))
43+
3644
def test_muwm_2489(self):
3745
self.set_user('javerage')
3846
self.set_date('2013-05-30')
@@ -95,4 +103,4 @@ def test_grade_events(self):
95103
data = json.loads(response.content)
96104
self.assertEquals(len(data), 1)
97105
self.assertEquals(data[0]["summary"],
98-
"*Autumn break")
106+
"Quarter Break - Autumn")

0 commit comments

Comments
 (0)