Commit fe306ca
committed
Allow Canvas to set IMathAS due dates
Squashed commit of the following:
commit 761435fa5e03d21835f331177372a3409c65b2cd
Merge: 213b1fcf d196961
Author: drlippman <drlippman@yahoo.com>
Date: Fri Mar 9 16:50:19 2018 -0800
Merge branch 'master' into feature.set_duedates_by_lti
# Conflicts:
# course/addassessment.php
# includes/calendardata.php
# includes/calendardisp.php
# includes/copyiteminc.php
# includes/loaditemshowdata.php
commit 213b1fcfc63263f01555e9bf3aaa0eb59aedc62f
Author: drlippman <drlippman@yahoo.com>
Date: Thu Mar 8 22:46:28 2018 -0800
Add latepass note to manage exceptions page
commit 1a6411d49417730566ffa533a3ebedbfc90a9cd7
Author: drlippman <drlippman@yahoo.com>
Date: Thu Mar 8 21:50:50 2018 -0800
Bug fix latepass after due date not working
commit 199b82b7252abfd74e6bd1fff14cadf1f3d91b56
Merge: e18653b2 c37c3b95
Author: drlippman <drlippman@yahoo.com>
Date: Thu Mar 8 19:59:22 2018 -0800
Merge branch 'feature.set_duedates_by_lti' of github.com:drlippman/IMathAS into feature.set_duedates_by_lti
commit e18653b227205a5982d192a609b631b03e31b57f
Author: drlippman <drlippman@yahoo.com>
Date: Sun Feb 4 15:08:07 2018 -0800
Add necessary database migration
commit d3145efa136a893e8274332b2e094662e8033782
Author: drlippman <drlippman@yahoo.com>
Date: Sun Feb 4 11:17:48 2018 -0800
typo fix
commit 5c6a89536c753d288363b8bb565f85cfbdc73724
Author: drlippman <drlippman@yahoo.com>
Date: Sun Feb 4 11:09:40 2018 -0800
Add pseudo-exceptions for instructor LTI launches with different due date
Try to not confuse the teacher by showing the LMS-reported launch date,
though there may be some cases where this gets confusing too.
commit 2c792c6e73aa0b27431242c40625eebb75e10d00
Author: drlippman <drlippman@yahoo.com>
Date: Sun Feb 4 10:32:10 2018 -0800
Adjust handling to distinguish instructor-set date from student-set
For teachers, Canvas sends the due date of the first due date rule,
which will be a single student's custom due date if one is set.
To handle this, instructor launches will change the existing default
due date in OHM, but only until a student launches. At that point,
the student launch due date will be used, and the due date will become
fixed. Later instructor launches won't change the default due date.
commit 261cd9314bffa28ff720e7c8e3120cd6d4ea0b96
Author: drlippman <drlippman@yahoo.com>
Date: Sat Feb 3 14:56:51 2018 -0800
Change model to not use avail=0
Hide assessments with date_by_lti=1 from GB, calendar
commit df9f6586c511dc4ed9cf495409bc7a5a8e81d0e8
Author: drlippman <drlippman@yahoo.com>
Date: Fri Feb 2 18:13:07 2018 -0800
Bug fixes. Hide Redeem LatePass link if enddate=always
commit dec6613c263239ca0167aa2dbd1d4d30c0516267
Author: drlippman <drlippman@yahoo.com>
Date: Fri Feb 2 18:01:46 2018 -0800
clear is_lti exceptiosn when course setting disabled
commit 5f008f6de02ae27f277e13f0893ef84497862162
Author: drlippman <drlippman@yahoo.com>
Date: Fri Feb 2 17:54:40 2018 -0800
Adjust ccexport for date_by_lti
commit 215b48ebc7f77aa078bc761a670d42d09017ab85
Author: drlippman <drlippman@yahoo.com>
Date: Fri Feb 2 12:49:51 2018 -0800
More work on dates by lti
commit 35308daf82b6fceb98073ae66dc1206a20d2c07d
Author: drlippman <drlippman@yahoo.com>
Date: Fri Feb 2 10:55:31 2018 -0800
Initial work on setting due dates by LTI
commit c37c3b954877741325011c6cc6f8e4ccb50f4b0a
Author: drlippman <drlippman@yahoo.com>
Date: Sun Feb 4 15:08:07 2018 -0800
Add necessary database migration
commit c5db2fa1d5ccde2032b0faf7c40fc9f771f10f68
Author: drlippman <drlippman@yahoo.com>
Date: Sun Feb 4 11:17:48 2018 -0800
typo fix
commit 443500cb1f0e274e7db8a8f8e0b734d508b41467
Author: drlippman <drlippman@yahoo.com>
Date: Sun Feb 4 11:09:40 2018 -0800
Add pseudo-exceptions for instructor LTI launches with different due date
Try to not confuse the teacher by showing the LMS-reported launch date,
though there may be some cases where this gets confusing too.
commit 92bb67129b1c0da1912dfa1267115d42e963b143
Author: drlippman <drlippman@yahoo.com>
Date: Sun Feb 4 10:32:10 2018 -0800
Adjust handling to distinguish instructor-set date from student-set
For teachers, Canvas sends the due date of the first due date rule,
which will be a single student's custom due date if one is set.
To handle this, instructor launches will change the existing default
due date in OHM, but only until a student launches. At that point,
the student launch due date will be used, and the due date will become
fixed. Later instructor launches won't change the default due date.
commit 835175070fc0b312ef8131435ce0cda04c870969
Merge: 50731b1c e4ee0651
Author: drlippman <drlippman@yahoo.com>
Date: Sat Feb 3 14:57:51 2018 -0800
Merge branch 'experiment.un_lti_on_homepage' into feature.set_duedates_by_lti
commit 50731b1c62fea2986f3e77222ee978f239dd55ef
Author: drlippman <drlippman@yahoo.com>
Date: Sat Feb 3 14:56:51 2018 -0800
Change model to not use avail=0
Hide assessments with date_by_lti=1 from GB, calendar
commit 6f7dbfcfcaccf4ce3e6725b1c154b9e28a281004
Author: drlippman <drlippman@yahoo.com>
Date: Fri Feb 2 18:13:07 2018 -0800
Bug fixes. Hide Redeem LatePass link if enddate=always
commit d956d65502fc514d1481781093c5622f2c625127
Author: drlippman <drlippman@yahoo.com>
Date: Fri Feb 2 18:01:46 2018 -0800
clear is_lti exceptiosn when course setting disabled
commit 54679f71650cec7f54a4d49a496aea305a3372fb
Author: drlippman <drlippman@yahoo.com>
Date: Fri Feb 2 17:54:40 2018 -0800
Adjust ccexport for date_by_lti
commit 676781b16815e2e0ada54c4d6f05b3713579839d
Author: drlippman <drlippman@yahoo.com>
Date: Fri Feb 2 12:49:51 2018 -0800
More work on dates by lti
commit fc2549b654380a943306fb74566faab0b2ee649b
Author: drlippman <drlippman@yahoo.com>
Date: Fri Feb 2 10:55:31 2018 -0800
Initial work on setting due dates by LTI
commit e4ee0651b3dbc8df6d40c780304adb9868aa7a50
Author: drlippman <drlippman@yahoo.com>
Date: Fri Jan 5 17:18:58 2018 -0800
For teachers, move user out of LTI mode if they visit the homepage1 parent d196961 commit fe306ca
19 files changed
Lines changed: 319 additions & 74 deletions
File tree
- admin
- assessment
- course
- includes
- migrations
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
537 | 537 | | |
538 | 538 | | |
539 | 539 | | |
| 540 | + | |
| 541 | + | |
| 542 | + | |
| 543 | + | |
| 544 | + | |
540 | 545 | | |
541 | 546 | | |
542 | 547 | | |
543 | 548 | | |
544 | 549 | | |
545 | 550 | | |
546 | | - | |
| 551 | + | |
547 | 552 | | |
548 | 553 | | |
549 | 554 | | |
550 | | - | |
| 555 | + | |
551 | 556 | | |
552 | 557 | | |
553 | 558 | | |
| |||
557 | 562 | | |
558 | 563 | | |
559 | 564 | | |
| 565 | + | |
| 566 | + | |
| 567 | + | |
| 568 | + | |
| 569 | + | |
| 570 | + | |
| 571 | + | |
| 572 | + | |
| 573 | + | |
| 574 | + | |
| 575 | + | |
| 576 | + | |
| 577 | + | |
| 578 | + | |
| 579 | + | |
| 580 | + | |
| 581 | + | |
| 582 | + | |
| 583 | + | |
| 584 | + | |
| 585 | + | |
| 586 | + | |
| 587 | + | |
560 | 588 | | |
561 | 589 | | |
562 | 590 | | |
563 | 591 | | |
564 | | - | |
565 | | - | |
| 592 | + | |
| 593 | + | |
566 | 594 | | |
567 | 595 | | |
568 | 596 | | |
569 | 597 | | |
570 | | - | |
| 598 | + | |
571 | 599 | | |
572 | 600 | | |
573 | 601 | | |
| |||
700 | 728 | | |
701 | 729 | | |
702 | 730 | | |
| 731 | + | |
| 732 | + | |
| 733 | + | |
| 734 | + | |
703 | 735 | | |
704 | 736 | | |
705 | 737 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
409 | 409 | | |
410 | 410 | | |
411 | 411 | | |
412 | | - | |
| 412 | + | |
413 | 413 | | |
414 | 414 | | |
415 | 415 | | |
| |||
439 | 439 | | |
440 | 440 | | |
441 | 441 | | |
442 | | - | |
| 442 | + | |
443 | 443 | | |
444 | 444 | | |
445 | 445 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
296 | 296 | | |
297 | 297 | | |
298 | 298 | | |
| 299 | + | |
299 | 300 | | |
300 | 301 | | |
301 | 302 | | |
| |||
325 | 326 | | |
326 | 327 | | |
327 | 328 | | |
| 329 | + | |
328 | 330 | | |
329 | 331 | | |
330 | 332 | | |
| |||
545 | 547 | | |
546 | 548 | | |
547 | 549 | | |
| 550 | + | |
| 551 | + | |
| 552 | + | |
| 553 | + | |
| 554 | + | |
548 | 555 | | |
549 | 556 | | |
550 | 557 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
75 | 75 | | |
76 | 76 | | |
77 | 77 | | |
78 | | - | |
| 78 | + | |
79 | 79 | | |
80 | 80 | | |
81 | 81 | | |
82 | 82 | | |
83 | 83 | | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
84 | 89 | | |
85 | 90 | | |
86 | 91 | | |
| |||
92 | 97 | | |
93 | 98 | | |
94 | 99 | | |
95 | | - | |
96 | | - | |
| 100 | + | |
| 101 | + | |
97 | 102 | | |
98 | 103 | | |
99 | 104 | | |
| |||
674 | 679 | | |
675 | 680 | | |
676 | 681 | | |
| 682 | + | |
677 | 683 | | |
678 | 684 | | |
679 | 685 | | |
680 | 686 | | |
681 | | - | |
| 687 | + | |
682 | 688 | | |
683 | 689 | | |
684 | 690 | | |
685 | 691 | | |
| 692 | + | |
| 693 | + | |
| 694 | + | |
| 695 | + | |
| 696 | + | |
| 697 | + | |
| 698 | + | |
686 | 699 | | |
687 | 700 | | |
688 | 701 | | |
| |||
696 | 709 | | |
697 | 710 | | |
698 | 711 | | |
699 | | - | |
| 712 | + | |
700 | 713 | | |
701 | 714 | | |
702 | | - | |
703 | | - | |
| 715 | + | |
| 716 | + | |
704 | 717 | | |
705 | 718 | | |
706 | 719 | | |
| |||
722 | 735 | | |
723 | 736 | | |
724 | 737 | | |
725 | | - | |
| 738 | + | |
726 | 739 | | |
727 | 740 | | |
728 | 741 | | |
729 | 742 | | |
730 | 743 | | |
731 | 744 | | |
732 | 745 | | |
| 746 | + | |
733 | 747 | | |
734 | 748 | | |
735 | 749 | | |
| |||
1467 | 1481 | | |
1468 | 1482 | | |
1469 | 1483 | | |
1470 | | - | |
| 1484 | + | |
1471 | 1485 | | |
1472 | 1486 | | |
1473 | 1487 | | |
| |||
1502 | 1516 | | |
1503 | 1517 | | |
1504 | 1518 | | |
1505 | | - | |
| 1519 | + | |
| 1520 | + | |
| 1521 | + | |
| 1522 | + | |
| 1523 | + | |
1506 | 1524 | | |
1507 | | - | |
1508 | | - | |
1509 | 1525 | | |
1510 | 1526 | | |
1511 | 1527 | | |
| |||
0 commit comments