forked from Cagoss85/CS-3733-Group-Project-Kotlin
-
Notifications
You must be signed in to change notification settings - Fork 0
/
log.txt
1739 lines (1170 loc) · 49.2 KB
/
log.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
commit fc31e31d1dd9b97735299fe8de37977579462125
Author: Josh <[email protected]>
Date: Fri Dec 11 16:03:03 2020 -0500
get report table refresh fix
commit 7aef6e109586ab168d404a7419ac625a2f18f824
Author: Josh <[email protected]>
Date: Fri Dec 11 15:44:18 2020 -0500
fix alert for signing in to deleted choice
commit 55f57b3ebaecca833b676ce484db9d2ee621fde3
Author: Josh <[email protected]>
Date: Fri Dec 11 15:16:20 2020 -0500
final UI changes for completed choice
commit 7bb71777300f61ea0656fcb277b7f4fe0a46400f
Author: Josh <[email protected]>
Date: Fri Dec 11 14:37:47 2020 -0500
fix for get choice response when getting completed choice
commit 0589447808f17d7da8a373a2cd078b20423db0ed
Author: Josh <[email protected]>
Date: Fri Dec 11 12:59:11 2020 -0500
add log statement to completeChoice.js
commit c3df42bfdb52f75a2b21d914f8f0c3ea86b009fe
Author: Josh <[email protected]>
Date: Thu Dec 10 19:17:29 2020 -0500
fixing select final alternative handler request/response
commit 13d3f60dab5332afa81a4f291c22feb65789ce99
Author: Arnold-Muralt <[email protected]>
Date: Thu Dec 10 19:03:14 2020 -0500
pushing fixed versions of code
commit b67923bc5619dc0f63093dd4f7fe59588002d91a
Merge: fc91b22 6e38446
Author: Arnold-Muralt <[email protected]>
Date: Thu Dec 10 18:42:14 2020 -0500
Merge branch 'master' of https://github.com/Cagoss85/CS-3733-Group-Project-Kotlin.git
commit 6e38446d34dc7fcce6eb22812b548a8ed1b8c38b
Author: Josh <[email protected]>
Date: Thu Dec 10 18:40:54 2020 -0500
completing choice UI done (maybe?)
commit 8274ac15753fd63950902f995d80315937b34bb5
Author: Josh <[email protected]>
Date: Thu Dec 10 18:11:35 2020 -0500
Complete choice request
commit fc91b225d60743a51e5a0032bd9ffe8a1cb2133f
Merge: 1df71e5 697dabd
Author: Arnold-Muralt <[email protected]>
Date: Thu Dec 10 18:00:33 2020 -0500
Merge branch 'master' of https://github.com/Cagoss85/CS-3733-Group-Project-Kotlin.git
commit 1df71e58636e2416564a7313fcf57426f992c230
Author: Arnold-Muralt <[email protected]>
Date: Thu Dec 10 18:00:23 2020 -0500
implemented blocking of adding feedback to closed. misc testing
commit 697dabd37e76379b7e1b24a0cd1a4c5227c1bc47
Author: Josh <[email protected]>
Date: Thu Dec 10 17:54:29 2020 -0500
final feedback UI tweaks
commit a75ca56377021d312c7ab14f485fc574a73e6f10
Author: Arnold-Muralt <[email protected]>
Date: Thu Dec 10 17:20:07 2020 -0500
Select Final Alternative fixes
commit c941b4556e342e55f49e29fe7e0453bf1586edc1
Author: cagoss85 <[email protected]>
Date: Thu Dec 10 17:07:50 2020 -0500
Added functions to return timestamp timestamp as a string
commit b0b753a447aa178888bfb19644486e74b6940eb9
Author: Arnold-Muralt <[email protected]>
Date: Thu Dec 10 17:01:17 2020 -0500
updating Select final alternative to no longer use alternative class
commit 01ccc6028f470285488538af028f4fc3b9fa865e
Merge: 3cc103a 148be27
Author: cagoss85 <[email protected]>
Date: Thu Dec 10 16:53:45 2020 -0500
Merge branch 'master' of https://github.com/Cagoss85/CS-3733-Group-Project-Kotlin.git
commit 3cc103a85be8edbacc19c670ab23d6cf8ec7b77c
Author: cagoss85 <[email protected]>
Date: Thu Dec 10 16:53:30 2020 -0500
Fixed error where timestamp went into text field
commit 148be2787b80f0ebf3ca96db559555a8766aa16f
Author: Arnold-Muralt <[email protected]>
Date: Thu Dec 10 16:52:25 2020 -0500
updates to Final alternative handler to refelect DB struct
commit 48254e332b19c07fc6f57dca8daa9741885c468f
Author: Arnold-Muralt <[email protected]>
Date: Thu Dec 10 16:49:55 2020 -0500
update choices DAO to reflect actual state of the DB
commit 8db00f26411843c0f7a6785f792529e1478cbefd
Author: cagoss85 <[email protected]>
Date: Thu Dec 10 16:46:42 2020 -0500
Added functions for adding feedback to alts when getChoice is called
commit e3c990911df1f960f2d4ad55c464b025b645fd57
Merge: 4068a12 b33c70f
Author: Josh <[email protected]>
Date: Thu Dec 10 16:37:06 2020 -0500
Merge branch 'master' of https://github.com/Cagoss85/CS-3733-Group-Project-Kotlin.git
commit 4068a124256c71956dbd6bfefd82c2c163a9c773
Author: Josh <[email protected]>
Date: Thu Dec 10 16:36:53 2020 -0500
Minor tweaks to Feedback UI
commit b33c70faadf6632c30ef6c0e322da59ad8ff3b0a
Author: cagoss85 <[email protected]>
Date: Thu Dec 10 16:30:50 2020 -0500
Deleted some branches
commit b173be0839d7adb48d765446444a403387c5bb61
Author: alindberg999 <[email protected]>
Date: Thu Dec 10 16:23:08 2020 -0500
Fixed weird refresh error for when there are no choices in the database.
commit 143108d6fbef3f4e83d8dad6a79d1bc74bca276a
Merge: d2e21cc 831fcd7
Author: alindberg999 <[email protected]>
Date: Thu Dec 10 16:22:36 2020 -0500
Merge branch 'master' of https://github.com/Cagoss85/CS-3733-Group-Project-Kotlin.git
commit 831fcd744063c4c475eb1f81796ab0cf24aec501
Merge: 933cf7a c074e4f
Author: Arnold-Muralt <[email protected]>
Date: Thu Dec 10 16:21:05 2020 -0500
Merge remote-tracking branch 'origin/Refusing_changes_to_closed_choices'
Conflicts:
src/main/java/edu/wpi/cs3733/b20/kotlin/demo/db/ChoicesDAO.java
src/main/java/edu/wpi/cs3733/b20/kotlin/demo/http/GetChoiceResponse.java
commit d2e21cc997c45d8c96d46e1f05caa03622655f5e
Merge: 5bffb41 933cf7a
Author: alindberg999 <[email protected]>
Date: Thu Dec 10 16:03:12 2020 -0500
Merge branch 'master' of https://github.com/Cagoss85/CS-3733-Group-Project-Kotlin.git
commit c074e4f7b880c116c5e83e0ec742f75d238a84d1
Author: Arnold-Muralt <[email protected]>
Date: Thu Dec 10 15:55:06 2020 -0500
added gating to dis/approval so closed choice=closed choice
commit 933cf7ab07eaedf7eeb7379d2695fa370d5aed5e
Author: cagoss85 <[email protected]>
Date: Wed Dec 9 21:53:36 2020 -0500
JUnit test cases delete cases made 5 seconds prior
commit d30e06309a94ca751833fcd108a4a813a4e7c108
Author: cagoss85 <[email protected]>
Date: Wed Dec 9 21:50:07 2020 -0500
Added response for deleting choices and did some other stuff
commit ba4308abc2da9fcd98d60324705914c8aae2b423
Author: Arnold-Muralt <[email protected]>
Date: Wed Dec 9 21:48:49 2020 -0500
test case for final alternative
commit 5bffb41ee1ecf76a1946e4fee9db1e513a904ebb
Author: alindberg999 <[email protected]>
Date: Wed Dec 9 21:45:30 2020 -0500
Trying to fix not refreshing
commit 2f7dbd05a5bff443da1e1c13f9f57dd6da9dd2a7
Author: Arnold-Muralt <[email protected]>
Date: Wed Dec 9 21:02:01 2020 -0500
response for request to set final alternatives
commit 0945ff6729310dd81b895fea0d3610ee3719bc76
Author: Arnold-Muralt <[email protected]>
Date: Wed Dec 9 21:01:21 2020 -0500
request to set final alternative values file
commit dfa1355e52f0af284546b7417e2f35927d2038b6
Author: Arnold-Muralt <[email protected]>
Date: Wed Dec 9 21:00:52 2020 -0500
handler to allow for the setting of final alternative variables
commit 4a309a07b51933f3cf512c4e72b712ed5c755846
Author: Arnold-Muralt <[email protected]>
Date: Wed Dec 9 20:59:53 2020 -0500
adds isClosed bool to get choice response
commit d24fccd3fed45814a47cb3ae970fa93a42bd8d8a
Author: Arnold-Muralt <[email protected]>
Date: Wed Dec 9 20:59:02 2020 -0500
adds function to add Final alternative to the choice data base
commit 1b122606ad7bc00ba3f049b861fede95e33f9937
Author: Arnold-Muralt <[email protected]>
Date: Wed Dec 9 20:57:57 2020 -0500
cleaned up file a bit
commit 77eab136268d797d2817625a47bb60df2dd41ff3
Author: alindberg999 <[email protected]>
Date: Wed Dec 9 20:32:29 2020 -0500
Made it so the report refreshes correctly
commit 9ea4d6d4d7281570ff29155b26d76606e02b5992
Author: Josh <[email protected]>
Date: Wed Dec 9 20:11:22 2020 -0500
toggleUI fix
commit 51ab689d97162da30a3f853da4f2ced332dfa2e8
Author: alindberg999 <[email protected]>
Date: Wed Dec 9 20:10:42 2020 -0500
trying to fix
commit cbd1f8f4da44d8f2eba4b05c1753bff76520aaf9
Merge: 32a8ca2 5af7944
Author: alindberg999 <[email protected]>
Date: Wed Dec 9 20:10:29 2020 -0500
Merge branch 'master' of https://github.com/Cagoss85/CS-3733-Group-Project-Kotlin.git
commit 32a8ca251cdb423bb1829e8a08b27f4ad6cfc561
Author: alindberg999 <[email protected]>
Date: Wed Dec 9 20:10:13 2020 -0500
trying to fix
commit 5af7944eff0b92bbc5a0abbe99aa54fd5d386636
Merge: a114b59 349b4eb
Author: Josh <[email protected]>
Date: Wed Dec 9 19:50:52 2020 -0500
Merge branch 'master' of https://github.com/Cagoss85/CS-3733-Group-Project-Kotlin.git
commit a114b5980af7f0f701eb012426298486ec4b870a
Author: Josh <[email protected]>
Date: Wed Dec 9 19:50:35 2020 -0500
Trying to fix create feedback
commit 349b4ebc91d599ff38e84e8661e0f66ea2248f2b
Author: alindberg999 <[email protected]>
Date: Wed Dec 9 19:50:03 2020 -0500
Change word syntax
commit a56adf55fce4f225977df32b8290aa2f7b28883a
Author: Josh <[email protected]>
Date: Wed Dec 9 19:29:36 2020 -0500
pushing to try to fix create feedback
commit 81cb527c838bc7684ed44e03c5b8254a8ef26fe3
Merge: 0eb4e6d 2c5f8bc
Author: Josh <[email protected]>
Date: Wed Dec 9 14:21:02 2020 -0500
Merge remote-tracking branch 'origin/Addding_Feedback_Client'
commit 2c5f8bc8f477d115e895ab0d7934cbc1d0bf50ad
Author: Josh <[email protected]>
Date: Wed Dec 9 14:19:51 2020 -0500
API update for deleting stale choices
commit 4986cf301f256c641abe917587a3b7e2e0d532eb
Author: Josh <[email protected]>
Date: Wed Dec 9 14:17:00 2020 -0500
Viewing feedback functionality in place
commit 0eb4e6d3666f9a9c608675eca83d386e0dd58106
Merge: d284a0b cb22f21
Author: alindberg999 <[email protected]>
Date: Wed Dec 9 13:46:48 2020 -0500
Merge remote-tracking branch 'origin/Admin_Console'
commit cb22f21ad5aa1188688176ed19e5d42c55fb012e
Author: alindberg999 <[email protected]>
Date: Wed Dec 9 13:45:26 2020 -0500
Admin Console and handleDeleteClick Work
commit 6ec6ecb9fce4c6035ac61a663ad901811c8622eb
Author: alindberg999 <[email protected]>
Date: Wed Dec 9 11:08:08 2020 -0500
try to simplify handleDeleteClick
commit 667ec57d290694c636d5d3e7cb2e79def5362396
Author: Josh <[email protected]>
Date: Tue Dec 8 20:18:41 2020 -0500
code for sending add feedback request
commit d284a0b2d47a885cb662d9685c2eaad0d268ff60
Author: cagoss85 <[email protected]>
Date: Tue Dec 8 20:16:52 2020 -0500
Added functionality for deleting choices over n days old
commit 8a24eab4c06ba0a3f9f52f9091b56538cee0c08d
Author: alindberg999 <[email protected]>
Date: Tue Dec 8 20:07:51 2020 -0500
Maybe handle delete works maybe
commit 9d5729b24c0197b07356fc7c80472e2bd366cf41
Author: Josh <[email protected]>
Date: Tue Dec 8 20:01:42 2020 -0500
Feedback UI mostly functional
commit f086498e8942265f3def4eb0d45e9cfc4a1d869e
Author: alindberg999 <[email protected]>
Date: Tue Dec 8 19:57:09 2020 -0500
more work with error codes
commit e2f240f1253fcb30fbde2cf595c68f3d59552490
Author: alindberg999 <[email protected]>
Date: Tue Dec 8 19:48:04 2020 -0500
working on handledeleteclick
commit 96ceab9c8d53553031ab97ab288829c45fb985e2
Author: alindberg999 <[email protected]>
Date: Tue Dec 8 19:33:42 2020 -0500
trying to handle click
commit f51464d53fd6c1886297464174e765bda92a4e8e
Author: Josh <[email protected]>
Date: Tue Dec 8 19:15:45 2020 -0500
realized I made loads of changes without committing anything so I should
probably commit now.
commit adaff7ae24fb910a57dd41d015e839774716aaf0
Author: alindberg999 <[email protected]>
Date: Tue Dec 8 19:01:03 2020 -0500
trying to add handle click function for the delete
commit 4448f0e3ac80e388f55e912de31d93b39ad415b6
Author: cagoss85 <[email protected]>
Date: Tue Dec 8 18:36:07 2020 -0500
Added test for duplicate feedback (results in false)
commit 2943a9d3838ea62bf3cf026be4cd9fd74de01518
Author: Arnold-Muralt <[email protected]>
Date: Tue Dec 8 18:30:19 2020 -0500
added isChoiceopen and correlating changes to handlerequest
commit 0053d5746a35b2d8e72c729c0a7beb67e408be1d
Author: alindberg999 <[email protected]>
Date: Tue Dec 8 18:29:22 2020 -0500
Table Works
commit aadc12f4e9037fddf3b9912a723386908d59bce5
Author: alindberg999 <[email protected]>
Date: Tue Dec 8 18:25:17 2020 -0500
Working on fixing table
commit 971cc793cc65fae8d4a833f2f7c4835c91239c3d
Author: cagoss85 <[email protected]>
Date: Tue Dec 8 18:23:32 2020 -0500
Added a choice description field for admin reports
commit 33453cc55740755a4c155eef58e0ae453046c431
Author: alindberg999 <[email protected]>
Date: Tue Dec 8 17:18:51 2020 -0500
Change adminConsole Back to original to try and fix 403
commit a9195b37bd0edd1f78c9ff05d8b263d0dfe58b1d
Author: alindberg999 <[email protected]>
Date: Tue Dec 8 16:57:25 2020 -0500
Change getReport to get rid of extra lists
commit 39dd85e228a9a7a4dd88784dd41ccc6120faf4cd
Author: alindberg999 <[email protected]>
Date: Tue Dec 8 14:19:47 2020 -0500
trying to fix admin error
commit 822cdf77a5e96ac6ce7254a48d31a28bb934b56b
Author: cagoss85 <[email protected]>
Date: Mon Dec 7 21:19:20 2020 -0500
Merged Feedback with master branch
commit 92fecf3ffc893075c42c3c0d4317b18eb772aaa9
Merge: 2e52abf fe7cffe
Author: cagoss85 <[email protected]>
Date: Mon Dec 7 21:19:04 2020 -0500
Merge remote-tracking branch 'origin/feedback'
commit fe7cffebcc34cd897dfd5b7cece76ab533f19172
Author: cagoss85 <[email protected]>
Date: Mon Dec 7 21:14:29 2020 -0500
No time buffer required, SQL param needed to be a PK to allow duplicates
commit 35fa8eac5e2a4c5c3f26e4bbaf6bf37bcdba1f5c
Author: cagoss85 <[email protected]>
Date: Mon Dec 7 21:00:42 2020 -0500
Feedback can be created. Needs time buffer for duplicate SQL entries.
commit 95a9373edf44a293db9e441e366f994509f0cd9d
Author: cagoss85 <[email protected]>
Date: Mon Dec 7 19:59:45 2020 -0500
FeedbackDAO and Handler function created, ready for testing
commit 897c238ddcf80cfbb1c5207319f37acd020da4fe
Author: cagoss85 <[email protected]>
Date: Mon Dec 7 19:19:59 2020 -0500
Created Feedback Class
commit 2e52abf08deb11d18fd96b667f34fa78d587a6a4
Merge: e05ef59 a9584bb
Author: Josh <[email protected]>
Date: Sat Dec 5 13:25:49 2020 -0500
Merge remote-tracking branch 'origin/master' into approvals_front_end
commit a9584bb48b98711228cc21b2b8d5ba3967b1e843
Author: Arnold <Arnold@CLOUD-TOP-430>
Date: Sat Dec 5 13:16:51 2020 -0500
Added case in approvals and disapprovals to remove other
commit e05ef5995b8c0c3c7556aa75d60d0241a22c4547
Author: Josh <[email protected]>
Date: Sat Dec 5 13:00:39 2020 -0500
minor fix for disapproval controls
commit a31ff38158d788fb78b799873ae30fac98059a13
Author: Josh <[email protected]>
Date: Sat Dec 5 01:26:57 2020 -0500
minor tweaks, added refresh choice button
commit 0eaba447c6d4f764624f9f571f618de35eec00c7
Author: Josh <[email protected]>
Date: Sat Dec 5 01:20:09 2020 -0500
Initial effort to add disapproval. Also some UI tweaks and loading msg.
commit 07b652e1ce27c72e855924281f4419ca7e0acf91
Merge: de0be60 f90496e
Author: Josh <[email protected]>
Date: Sat Dec 5 00:18:42 2020 -0500
Merge remote-tracking branch 'origin/master' into approvals_front_end
commit de0be603c04a1a7283f004065ad490eaa162a6ef
Author: Josh <[email protected]>
Date: Fri Dec 4 20:59:31 2020 -0500
approvals functional
commit f90496e60d40f5630fdfeec0d6c4c583bd085606
Author: Arnold <Arnold@CLOUD-TOP-430>
Date: Fri Dec 4 19:09:51 2020 -0500
added approvals to the alternatives
commit ace6de4c4fc0d486e3b03eba740d436aaf32da51
Author: Arnold <Arnold@CLOUD-TOP-430>
Date: Fri Dec 4 19:00:10 2020 -0500
added overload for alternative constructor to take app disapp
commit 6047e92b3c64c00a03e53c9611ce929ff08a64d7
Merge: 53e5eaf a640c5d
Author: Josh <[email protected]>
Date: Fri Dec 4 18:59:06 2020 -0500
Merge remote-tracking branch 'origin/master' into approvals_front_end
commit 53e5eaf2d1729a8dea22efba5594d9a181a2fb9f
Author: Josh <[email protected]>
Date: Fri Dec 4 18:58:01 2020 -0500
continued addApproval work
commit a640c5d2aea9066c922e1f238db57e438d21f52e
Author: alindberg999 <[email protected]>
Date: Fri Dec 4 17:55:15 2020 -0500
Fixed the DisapprovalHandlerTest
commit c3b330b06a34a2dde9db20f1958c0ee738249483
Author: cagoss85 <[email protected]>
Date: Fri Dec 4 17:46:08 2020 -0500
Switched order of create proval function attributes
commit f914fc5dc7864f8ce2c27c847e1c26c6dd16d63a
Author: cagoss85 <[email protected]>
Date: Fri Dec 4 17:43:39 2020 -0500
Fixed JUnit tests
commit 8733550f0cefba945992e473908f788dbd18172f
Merge: 53e075d 648bed9
Author: cagoss85 <[email protected]>
Date: Fri Dec 4 17:41:59 2020 -0500
Merge remote-tracking branch 'origin/Adding_App-DisApproval_DAO'
Conflicts:
target/classes/META-INF/maven/edu.wpi.cs3733.b20.kotlin/demo/pom.properties
commit 53e075db11418c63a2b9d7def8720943752acf7b
Author: cagoss85 <[email protected]>
Date: Fri Dec 4 17:41:10 2020 -0500
trying to fix problem
commit 648bed9b1d7b71ebeb74507a237eed6e3d59c17f
Author: cagoss85 <[email protected]>
Date: Fri Dec 4 17:40:31 2020 -0500
trying to fix merge problem
commit 709e22c610178df10a08d319dd34e7ed80aeb965
Author: alindberg999 <[email protected]>
Date: Fri Dec 4 17:34:10 2020 -0500
Finishing Disapproval test cases
commit 2081c71f44a4afa2d6fcc16fe95c5713ad45d775
Author: alindberg999 <[email protected]>
Date: Fri Dec 4 17:22:53 2020 -0500
Fix Comments in Disapprovals DAO
commit 87e92f6ec43d4a485955c83a6b5cd8c3818a54a0
Author: alindberg999 <[email protected]>
Date: Fri Dec 4 17:21:03 2020 -0500
Create Disapproval
commit 5e59c738b752d5ab8a222e4d832bb9c5f7a1a7a2
Merge: 04fdab1 f7e461e
Author: Josh <[email protected]>
Date: Thu Dec 3 18:22:28 2020 -0500
Merge branch 'Adding_App-DisApproval_DAO' of
https://github.com/Cagoss85/CS-3733-Group-Project-Kotlin.git into
Adding_App-DisApproval_DAO
Conflicts:
src/main/java/edu/wpi/cs3733/b20/kotlin/demo/db/ApprovalsDAO.java
src/test/java/edu/wpi/cs3733/b20/kotlin/demo/TestApprovalHandler.java
commit 04fdab1343b616cadde4ddcf4616cac988189f09
Author: Josh <[email protected]>
Date: Thu Dec 3 18:20:23 2020 -0500
Adding approval removal to JUnit test
commit f7e461e28a92a32d400bf103719c53d2eb717a21
Author: cagoss85 <[email protected]>
Date: Thu Dec 3 17:51:25 2020 -0500
Re-structured Approval Constructor
commit c23a979b8a14b1439a66d03eba4f443a97ef9b34
Author: Arnold <Arnold@CLOUD-TOP-430>
Date: Thu Dec 3 17:43:56 2020 -0500
testcase fix, fields were being set in wrong order
commit b35ea14a39273300cc958db50700e1df3ad1aaae
Author: Arnold <Arnold@CLOUD-TOP-430>
Date: Thu Dec 3 17:38:07 2020 -0500
push of null pointer error fix in ApprovalsDAO
commit 35b183ae1012826e164a4b4d1c2e8a415b378d95
Merge: b169a0f 3ff8848
Author: Josh <[email protected]>
Date: Thu Dec 3 17:30:17 2020 -0500
Merge remote-tracking branch 'origin/master' into approvals_front_end
commit b169a0fc5545b260a7f41ca177057182632c2a9f
Author: Josh <[email protected]>
Date: Thu Dec 3 17:28:20 2020 -0500
Wrapping up initial create/get approval work
commit 3ff8848d97f377c6b35f44f15825843acaa6c746
Author: alindberg999 <[email protected]>
Date: Thu Dec 3 17:22:57 2020 -0500
added more test cases for authenticating user
commit e5cff227dc6786a8cb192b2fec0b2dcc1fcf8ef9
Author: alindberg999 <[email protected]>
Date: Thu Dec 3 17:02:55 2020 -0500
More Coverage for the User Class
commit 467f4fc342745decabd769f0659074e0b26b7b03
Author: Arnold <Arnold@CLOUD-TOP-430>
Date: Thu Dec 3 16:55:33 2020 -0500
slight name changes
commit 79db39e5a07ab504c4266a0b86653583ab5f08a0
Author: Arnold <Arnold@CLOUD-TOP-430>
Date: Thu Dec 3 16:53:01 2020 -0500
Push for others to look at my shitty code
commit 37ece1cc5d807a9b5cde554ede5525628c2dcdbc
Author: alindberg999 <[email protected]>
Date: Thu Dec 3 16:50:33 2020 -0500
Test cases
commit 2b6b7d2e3c552b596b72a2ce1f0109068f56cb60
Author: alindberg999 <[email protected]>
Date: Thu Dec 3 16:46:19 2020 -0500
Added User to String test case for code coverage.
commit 8605bf739faa7d34a1a117e16bad2df7de7f7edb
Author: Arnold <Arnold@CLOUD-TOP-430>
Date: Thu Dec 3 15:52:39 2020 -0500
Approvals should now delete on a duplicate call of addApproval
commit 2063b3f82156b61230d36debc897eb360bc4e281
Author: Arnold <Arnold@CLOUD-TOP-430>
Date: Thu Dec 3 14:47:39 2020 -0500
added .equals function to approval, and added approval checking in DAO
commit 88f88e7309d3f1454cc1836ed175521002d37a19
Author: Josh <[email protected]>
Date: Thu Dec 3 13:33:34 2020 -0500
setup for showing approvals
commit e61d148413d5951914b2bd95f012e9294a4d7d98
Merge: 0921ca0 2be6fc6
Author: alindberg999 <[email protected]>
Date: Wed Dec 2 20:20:49 2020 -0500
Merge remote-tracking branch 'origin/get_report'
commit 0921ca02751d2f9e4cfd936c98f31e98c23a3a85
Merge: 3cea7ce 20987f6
Author: alindberg999 <[email protected]>
Date: Wed Dec 2 20:20:35 2020 -0500
Merge branch 'master' of https://github.com/Cagoss85/CS-3733-Group-Project-Kotlin.git
commit 2be6fc6ce03b60e9f04c3ab2c774ffd8ef30d7e2
Author: alindberg999 <[email protected]>
Date: Wed Dec 2 20:16:10 2020 -0500
Get Report works
commit 42467d8fd9e695a726574b523cfff1742e7beb19
Author: Arnold <Arnold@CLOUD-TOP-430>
Date: Wed Dec 2 19:47:05 2020 -0500
End of day Commit. Do not merge into Master, code is incomplete
commit 4b98486d18a22df45c15e0bff14f256a981b8938
Author: alindberg999 <[email protected]>
Date: Wed Dec 2 19:42:26 2020 -0500
Fixed loop and adding ID
commit ffca23c1bf0ff7156c6bfb3ae5dd6119f9a2d6af
Author: alindberg999 <[email protected]>
Date: Wed Dec 2 19:02:50 2020 -0500
few comments
commit 147bfef7d77ae244b4cc8963b3f9270fa477e7c2
Author: Josh <[email protected]>
Date: Wed Dec 2 14:36:42 2020 -0500
update to 2 col layout, fixes
commit 643387e5c39d0c2a44fc2a643ccfad1b1f74245c
Author: Josh <[email protected]>
Date: Wed Dec 2 14:30:33 2020 -0500
establishing column structure
commit a8a27e30c4a31678321c3c9f0c24c19327113a30
Author: alindberg999 <[email protected]>
Date: Wed Dec 2 14:28:54 2020 -0500
more typo
commit 221f983e810331d2c2ba1d28a1ef5d0d555e5bab
Author: alindberg999 <[email protected]>
Date: Wed Dec 2 14:26:41 2020 -0500
Fixed Typos
commit 16814566c271470b2d95cbc4d4355a7166443a3e
Author: Josh <[email protected]>
Date: Wed Dec 2 13:59:45 2020 -0500
Single button handling approval
commit 1ac042a48fc8eda778cd3839aa9f37bf1d476d25
Author: alindberg999 <[email protected]>
Date: Wed Dec 2 13:51:54 2020 -0500
Fixed for loop
commit 8ee6df00e167504276e2b8a8d2d68afaae502816
Author: alindberg999 <[email protected]>
Date: Wed Dec 2 13:26:41 2020 -0500
Create for loop foor the choice
commit 37d6aa1de681393d34174f778c244b3bf6b3ffcb
Author: alindberg999 <[email protected]>
Date: Wed Dec 2 13:21:53 2020 -0500
Add some Variables for report
commit 20987f67c361d8e5f61bbcce2431d7c2ce0622af
Author: cagoss85 <[email protected]>
Date: Mon Nov 30 23:41:39 2020 -0500
Revert "Revert "Removed print statements from code to clean it up""
This reverts commit af0a81ae52dab34bee6ca2244381b4d1473d9c8f.
commit af0a81ae52dab34bee6ca2244381b4d1473d9c8f
Author: cagoss85 <[email protected]>
Date: Mon Nov 30 23:41:33 2020 -0500
Revert "Removed print statements from code to clean it up"
This reverts commit f2b609c308879b7e8057db0dd96a543e52bb478e.
commit f2b609c308879b7e8057db0dd96a543e52bb478e
Author: cagoss85 <[email protected]>
Date: Mon Nov 30 23:40:32 2020 -0500
Removed print statements from code to clean it up
commit d28fcdb1d4f4f92d1a1f83a9059587bcbcf521d3
Merge: 2655a94 fe0d33c
Author: cagoss85 <[email protected]>
Date: Mon Nov 30 23:30:34 2020 -0500
Merge branch 'adminReport'
commit 2655a947f23838c76f54098cc391f3a9408a473a
Author: cagoss85 <[email protected]>
Date: Mon Nov 30 23:29:07 2020 -0500
trying to fix merging
commit fe0d33c1493ac774422b833a9f9cd46de6c64a04
Author: cagoss85 <[email protected]>
Date: Mon Nov 30 23:27:22 2020 -0500
trying to fix merging
commit 25853d12ac197f336064fb63c9441b935b1f0d80
Author: cagoss85 <[email protected]>
Date: Mon Nov 30 23:24:32 2020 -0500
Revert "minor changes"
This reverts commit e1758feb845bbcd0420f05d209c7fa405e375b03.
commit e1758feb845bbcd0420f05d209c7fa405e375b03
Author: cagoss85 <[email protected]>
Date: Mon Nov 30 23:20:27 2020 -0500
minor changes
commit 7d868e540af411ea2bf5ed70f38ce3105febd6b5
Author: cagoss85 <[email protected]>
Date: Mon Nov 30 23:15:24 2020 -0500
Added test cases for getChoiceHandler
commit 718ec8fc42686e9ce41f073f13aef957994209bb
Author: cagoss85 <[email protected]>
Date: Mon Nov 30 20:35:09 2020 -0500
fixing some stuff
commit c5cb8a54467e435c7ad9fac91389dad2b83ee450
Author: cagoss85 <[email protected]>
Date: Mon Nov 30 20:34:17 2020 -0500
updating some tests
commit 6f3c28716250572fc742a30caddffdfda93b7bbb
Author: cagoss85 <[email protected]>
Date: Mon Nov 30 20:06:09 2020 -0500
Fixed isChosen() boolean parsing, and cleaned up create user functions
Removed braces for single line if statements
commit 6a38d3f764a4dfaac18b998eac9ee38e92a050fc
Author: cagoss85 <[email protected]>
Date: Mon Nov 30 19:42:25 2020 -0500
Admin report timeCreated fixed
had to reference a different attribute
commit 2e477e1cfc9745a8fafc082fca7cff917c2e3c0a
Author: alindberg999 <[email protected]>
Date: Mon Nov 30 15:42:27 2020 -0500
Creating/mapping out processReportResponse
commit 76202547214436b2234bb1c758bbd52cc253bf5e
Author: alindberg999 <[email protected]>
Date: Mon Nov 30 15:39:08 2020 -0500
Fix Body of AdminConsole and added xhr function to getReport
commit f40aacd624a318b8aea31950e436db093ec2b93a
Author: cagoss85 <[email protected]>
Date: Mon Nov 30 13:55:00 2020 -0500
getReport function returns number of choices, their UUID, and status.
timeCreated only returns 0.
commit 06f8e5fa6d0b1d54d8bc27ee2be7a6356931c61f
Author: cagoss85 <[email protected]>
Date: Mon Nov 30 13:47:44 2020 -0500
Choice Report choice list size test
Reports successfully track the number of reports in the system.
commit 251b975319367e640c5c544af23ac0dec0cafa23
Author: Josh <[email protected]>
Date: Mon Nov 30 13:39:11 2020 -0500
Initial createApproval JS
commit 74ccda8e46124a48f1c296a686483ef86bf636a3
Author: cagoss85 <[email protected]>
Date: Sun Nov 29 23:46:20 2020 -0500
Added a couple comments
commit b67d31b80a9ffc5d34034e0f9ca6eb5fcd034ec5
Author: cagoss85 <[email protected]>
Date: Sun Nov 29 23:46:20 2020 -0500
Added a couple comments
commit 9a304973067f79aaffe84cff582d25ac6afb3694
Author: cagoss85 <[email protected]>
Date: Sun Nov 29 23:26:59 2020 -0500
Finished writing code, database updated
Ready for testing tomorrow
commit d3d82d7280b3758688bed0da1dcf410c00d650d1
Author: cagoss85 <[email protected]>
Date: Sun Nov 29 23:16:07 2020 -0500
Created Function for creating choice based on json data
Added String attributes to choice class for admin display
commit 470df2ed02bfb99a3c14c3f5e252797c5639725a
Author: alindberg999 <[email protected]>
Date: Sun Nov 29 16:47:29 2020 -0500
Working on getReport Function
commit a2ca842fc3e7550be3e0679495bb89ec87de1c9c
Author: alindberg999 <[email protected]>
Date: Sun Nov 29 16:42:39 2020 -0500
Working on body of Admin Console
commit 2fc4ee82c1d47797a0cc8f1966896408ba0422f5
Author: alindberg999 <[email protected]>
Date: Sun Nov 29 16:40:01 2020 -0500
Working on Head of AdminConsole.html
commit 406f1e402aa5366386d59ad4643ab6874c1e161b
Author: Josh <[email protected]>
Date: Sun Nov 29 16:23:36 2020 -0500
starting get report
commit 3e3ab8a1108726aca60707c7cd19b7aef32f14f7
Author: cagoss85 <[email protected]>
Date: Sun Nov 29 16:15:35 2020 -0500
Created handler class and function for getting all choices
commit 7276ef7aa6d25116f75fa8dec7d41d62a3195dbb
Author: Arnold <Arnold@CLOUD-TOP-430>
Date: Sun Nov 29 15:46:35 2020 -0500
Create all base files for lambdas and DAOs
commit 5c3b9c8a9e2a2998d70f4e04c69f53cbd67b237f
Author: cagoss85 <[email protected]>
Date: Sun Nov 29 15:40:02 2020 -0500
Created GetReportResponse class
commit 3cea7ce20c0fd7998a88d8ff28a8a2275c1385d9
Merge: 3d0b874 115730d
Author: alindberg999 <[email protected]>
Date: Sun Nov 29 15:04:30 2020 -0500
Merge branch 'master' of https://github.com/Cagoss85/CS-3733-Group-Project-Kotlin.git
commit 115730daaea7cd2fd2a64ea1f018d3a9349b736d
Author: Josh <[email protected]>
Date: Tue Nov 24 19:16:04 2020 -0500