Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixbug/muwm 5321 #3047

Merged
merged 9 commits into from
Jan 5, 2024
Merged

Fixbug/muwm 5321 #3047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8c77429
Resolve MUWM-5321
fanglinfang Jan 3, 2024
14ca321
deploy on vue.my
fanglinfang Jan 3, 2024
91fef1e
eslint fix
fanglinfang Jan 3, 2024
3ed1ee6
Merge branch 'qa' into fixbug/MUWM-5321
fanglinfang Jan 4, 2024
48a42ec
Resolve MUWM-5321
fanglinfang Jan 4, 2024
e78141f
disable cronjobs on vue.my
fanglinfang Jan 4, 2024
766fd61
Merge branch 'qa' into fixbug/MUWM-5321
fanglinfang Jan 4, 2024
c9ebe13
reset vue.my
fanglinfang Jan 5, 2024
10220c0
Merge branch 'fixbug/MUWM-5321' of https://github.com/uw-it-aca/myuw …
fanglinfang Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 1 addition & 79 deletions docker/vue-values.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,85 +58,7 @@ mountedSecrets:
secretName: vue.my.uw.edu-openssl-conf

cronjob:
enabled: true
jobs:
- name: expired-sessions
schedule: "1 10 * * 6"
command: ["/scripts/management_command.sh"]
args: ["clear_expired_sessions", "7"]
resources:
limits:
cpu: 75m
memory: 128Mi
requests:
cpu: 25m
memory: 32Mi
- name: cleanup-instructors
schedule: "1 12 11 11 *"
command: ["/scripts/management_command.sh"]
args: ["cleanup_instructors"]
resources:
limits:
cpu: 75m
memory: 128Mi
requests:
cpu: 25m
memory: 32Mi
- name: update-buildings
schedule: "1 11 1 * *"
command: ["/scripts/management_command.sh"]
args: ["load_buildings"]
resources:
limits:
cpu: 75m
memory: 64Mi
requests:
cpu: 25m
memory: 32Mi
- name: course-cleanup
schedule: "1 3 * 1,4,7,9 1"
command: ["/scripts/management_command.sh"]
args: ["db_cleanup", "course"]
resources:
limits:
cpu: 75m
memory: 128Mi
requests:
cpu: 25m
memory: 32Mi
- name: seenreg-cleanup
schedule: "1 3 * 1,4,7,9 2"
command: ["/scripts/management_command.sh"]
args: ["db_cleanup", "seenreg"]
resources:
limits:
cpu: 75m
memory: 128Mi
requests:
cpu: 25m
memory: 32Mi
- name: notice-cleanup
schedule: "1 3 * * 3"
command: ["/scripts/management_command.sh"]
args: ["db_cleanup", "notice"]
resources:
limits:
cpu: 75m
memory: 128Mi
requests:
cpu: 25m
memory: 32Mi
- name: linkvisit-cleanup
schedule: "1 3 * * 4"
command: ["/scripts/management_command.sh"]
args: ["db_cleanup", "linkvisit"]
resources:
limits:
cpu: 75m
memory: 128Mi
requests:
cpu: 25m
memory: 32Mi
enabled: false
environmentVariables:
- name: AUTH
value: SAML
Expand Down
187 changes: 3 additions & 184 deletions myuw_vue/components/teaching/course/grading/grading.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,213 +6,32 @@
<who-submits-grades :section="section"/>
<uw-grading-delegates
v-if="section.grade_submission_delegates.length > 0" :section="section"/>

<uw-card-property title="Grade Submission">
<template v-if="section.gradingPeriod.isOpen">
<div v-if="section.grading_status" class="myuw-text-md">

<span v-if="section.grading_status === 'error'">
<font-awesome-icon :icon="faExclamationTriangle" />
An error occurred with
<a href="https://gradepage.uw.edu/">Gradepage</a>. Please try again later.
</span>

<span v-else>
<span v-if="section.grading_status.allGradesSubmitted && !gradeSubmittedNotAccepted">
<!-- grades have been submitted -->
<a v-out="'Grade submitted'" :href="section.grading_status.section_url">
{{section.grading_status.submitted_count}}
grade{{section.grading_status.submitted_count ? 's' : ''}} submitted
</a>
</span>
<span v-else-if="gradeSubmittedNotAccepted">
<!-- grades submission unsuccessful -->
<div class="text-danger">
<font-awesome-icon :icon="faExclamationTriangle" />
Grades unsuccessfully submitted
</div>
Error with {{section.grading_status.submitted_count}}
grade{{section.grading_status.submitted_count ? 's' : ''}} submitted
</span>

<span v-if="section.grading_status.submitted_by">
by {{section.grading_status.submitted_by}}
</span>
<span v-if="section.grading_status.submittedFmt" class="text-nowrap">
on {{section.grading_status.submittedFmt}}
</span>

<br>
<span v-if="gradeSubmittedNotAccepted">
Please
<a
v-out="'Grade to submit'"
:href="section.grading_status.section_url"
>try resubmitting grades</a>
</span>
<span v-else-if="section.grading_status.unsubmitted_count">
<a
v-out="'Grade to submit'"
:href="section.grading_status.section_url"
>
{{section.grading_status.unsubmitted_count}}
grade{{section.grading_status.unsubmitted_count ? 's' : ''}}
to submit
</a>
</span>
<span v-else-if="section.is_primary_section ||
section.allows_secondary_grading">
<a
v-if="section.grading_status.no_grades_submitted"
:href="section.grading_status.section_url"
><!-- grades have not been submitted yet -->
Submit grades in Gradepage
</a>
<span v-else>
<!-- Display: term grade submission opens on... -->
{{section.grading_status.grading_status}}
<!-- ie, term grade submission opens on... -->
</span>
</span>
<span v-else>
<!-- Section is secondary and no grading -->
Grading for secondary section is disabled.
<a :href="section.grading_status.section_url">Grade primary section</a>.
</span>
</span>
<a
v-out="'GradePage Help'"
href="https://itconnect.uw.edu/learn/tools/gradepage/"
>
<font-awesome-icon :icon="faQuestionCircle" />
</a>
</div>

<div class="myuw-text-sm fst-italic">
Grade submission closes
<strong class="fw-bold">
{{section.gradingPeriod.deadlineFmt}}
</strong>
<span v-if="!section.deadline_in_24_hours">
({{section.gradingPeriod.deadlineRelative}})
</span>
</div>
</template>

<template v-else-if="section.gradingPeriod.isClosed">
<div v-if="section.grading_status" class="myuw-text-md">
<div v-if="section.grading_status.allGradesSubmitted && !gradeSubmittedNotAccepted">
<!-- grades submission successful -->
<a
v-out="'Grade submitted by'"
:href="section.grading_status.section_url"
>
{{section.grading_status.submitted_count}}
grade{{section.grading_status.submitted_count ? 's' : ''}}
submitted
</a>
<span v-if="section.grading_status.submitted_by">
by {{section.grading_status.submitted_by}}
</span>
<span v-if="section.grading_status.submittedFmt" class="text-nowrap">
on {{section.grading_status.submittedFmt}}
</span>
<br>
<div class="myuw-text-sm fst-italic">
Grade submission for {{titleCaseWord(section.quarter)}} {{section.year}} closed
<span class="text-nowrap">{{section.gradingPeriod.deadlineFmt}}</span>
</div>
</div>
<div v-else>
<div v-if="gradeSubmittedNotAccepted">
<!-- grades submission unsuccessful -->
<div class="text-danger">
<font-awesome-icon :icon="faExclamationTriangle" />
Grades unsuccessfully submitted
</div>

Error with {{section.grading_status.submitted_count}}
grade{{section.grading_status.submitted_count ? 's' : ''}} submitted
<span v-if="section.grading_status.submitted_by">
by {{section.grading_status.submitted_by}}
</span> on {{section.grading_status.submittedFmt}}
</div>
<div v-else>
<!-- grades were not submitted via GradePage -->
<span class="capitalize">
{{section.grading_status.grading_status ?
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

corresponding to the file below line 140 -144

section.grading_status.grading_status :
section.grading_status.unsubmitted_count
}} grade{{section.grading_status.unsubmitted_count ? 's': ''}}
not submitted through GradePage
</span>
</div>
<span class="myuw-text-sm fst-italic">
Grade submission for {{titleCaseWord(section.quarter)}} {{section.year}} closed
{{section.gradingPeriod.deadlineFmt}}
</span>
<br>
To make changes, use <a
href="http://itconnect.uw.edu/learn/tools/gradepage/change-submitted-grades/"
><em>Change Submitted Grades</em></a> form
</div>
</div>
</template>

<template v-else>
<div class="myuw-text-md">
Grade submission opens {{section.gradingPeriod.openFmt}}
<span v-if="!section.gradingPeriod.opensIn24Hours">
({{section.gradingPeriod.openRelative}})
</span>
</div>
<div class="myuw-text-sm fst-italic">
Grade submission closes
{{section.gradingPeriod.deadlineFmt}}
</div>
</template>
</uw-card-property>
<uw-grade-submission :section="section"/>
</uw-card-property-group>
</template>

<script>
import {
faQuestionCircle,
faExclamationTriangle
} from '@fortawesome/free-solid-svg-icons';
import CardPropertyGroup from '../../../_templates/card-property-group.vue';
import CardProperty from '../../../_templates/card-property.vue';
import GradingSystem from './grading-system.vue';
import InstructorsOfRecord from './instructors.vue';
import WhoSubmitsGrades from './who-submit-grade.vue';
import GradiungDelegates from './delegates.vue';
import GradeSubmission from './submission.vue';

export default {
components: {
'uw-card-property-group': CardPropertyGroup,
'uw-card-property': CardProperty,
'uw-graading-systme': GradingSystem,
'uw-insts-of-record': InstructorsOfRecord,
'who-submits-grades': WhoSubmitsGrades,
'uw-grading-delegates': GradiungDelegates,
'uw-grade-submission': GradeSubmission,
},
props: {
section: {
type: Object,
required: true,
},
},
data() {
return {
faQuestionCircle,
faExclamationTriangle,
}
},
computed: {
gradeSubmittedNotAccepted() {
return this.section.grading_status.submitted_date !== null
&& this.section.grading_status.accepted_date === null;
},
},
};
</script>
Loading
Loading