admin/raven-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-09-20 18:00:39 +00:00
parent c11e7c3ee6
commit bb25f14c94
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ayanova/src/views/home-review.vue
View File

@@ -60,17 +60,17 @@
<v-col cols="12" sm="6" lg="4" xl="3"> <v-col cols="12" sm="6" lg="4" xl="3">
<gz-date-time-picker <gz-date-time-picker
:label="$ay.t('ReviewDueDate')" :label="$ay.t('ReviewDate')"
:rules="[form().required(this, 'dueDate')]" :rules="[form().required(this, 'reviewDate')]"
v-model="obj.dueDate" v-model="obj.reviewDate"
:readonly=" :readonly="
formState.readOnly || formState.readOnly ||
(!selfAssigned && !currentUserIsASupervisor) (!selfAssigned && !currentUserIsASupervisor)
" "
ref="dueDate" ref="reviewDate"
data-cy="dueDate" data-cy="reviewDate"
:error-messages="form().serverErrors(this, 'dueDate')" :error-messages="form().serverErrors(this, 'reviewDate')"
@input="fieldValueChanged('dueDate')" @input="fieldValueChanged('reviewDate')"
></gz-date-time-picker> ></gz-date-time-picker>
</v-col> </v-col>
<v-col cols="12"> <v-col cols="12">
@@ -262,7 +262,7 @@ export default {
//I.E. Serial, usertype fields, ACTIVE //I.E. Serial, usertype fields, ACTIVE
//Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero //Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero
//{"data":{"id":2,"concurrency":1257740,"name":"Follow up on this unit","notes":"Additional text about this unit","wiki":null,"customFields":null,"tags":["completed.review","v8-migrate"], //{"data":{"id":2,"concurrency":1257740,"name":"Follow up on this unit","notes":"Additional text about this unit","wiki":null,"customFields":null,"tags":["completed.review","v8-migrate"],
//"dueDate":"2019-03-21T22:00:00Z","completedDate":"2019-03-21T22:00:00Z","completionNotes":null,"userId":2,"assignedByUserId":1,"objectId":9,"aType":31,"overDue":false}} //"reviewDate":"2019-03-21T22:00:00Z","completedDate":"2019-03-21T22:00:00Z","completionNotes":null,"userId":2,"assignedByUserId":1,"objectId":9,"aType":31,"overDue":false}}
{ {
id: 0, id: 0,
concurrency: 0, concurrency: 0,
@@ -271,7 +271,7 @@ export default {
wiki: null, wiki: null,
customFields: "{}", customFields: "{}",
tags: [], tags: [],
dueDate: null, reviewDate: null,
completedDate: null, completedDate: null,
completionNotes: null, completionNotes: null,
userId: window.$gz.store.state.userId, userId: window.$gz.store.state.userId,
@@ -709,7 +709,7 @@ async function fetchTranslatedText(vm) {
"Review", "Review",
"ReviewName", "ReviewName",
"ReviewNotes", "ReviewNotes",
"ReviewDueDate", "ReviewDate",
"ReviewCompletedDate", "ReviewCompletedDate",
"ReviewCompletionNotes", "ReviewCompletionNotes",
"ReviewUserId", "ReviewUserId",

2
ayanova/src/views/home-schedule.vue
View File

@@ -766,7 +766,7 @@ export default {
window.$gz.form.deleteAllErrorBoxErrors(this); window.$gz.form.deleteAllErrorBoxErrors(this);
let res = await window.$gz.api.post("schedule/personal", { let res = await window.$gz.api.post("schedule/personal", {
view: window.$gz.util.calendarViewToAyaNovaEnum(this.viewType), view: window.$gz.util.calendarViewToAyaNovaEnum(this.viewType),
darkMode: this.$store.state.darkMode, dark: this.$store.state.darkMode,
start: window.$gz.locale.localTimeDateStringToUTC8601String( start: window.$gz.locale.localTimeDateStringToUTC8601String(
`${start.date}T00:00:00`, `${start.date}T00:00:00`,
this.timeZoneName this.timeZoneName