This commit is contained in:
2021-03-08 00:36:38 +00:00
parent 49962d64be
commit 983618a9a8
2 changed files with 22 additions and 80 deletions

View File

@@ -233,7 +233,8 @@ todo: both rates need contract checkbox so they only appear in conjunction with
As non contract scenario is just all items As non contract scenario is just all items
Contract may or may not be all items plus contract or just contract (different queries) Contract may or may not be all items plus contract or just contract (different queries)
But it all needs to go through same picklist code for client simplicity But it all needs to go through same picklist code for client simplicity
todo: test error handling from server, correctly displays in table (narrator: "It didn't")
todo: help docs todo: help docs

View File

@@ -197,7 +197,7 @@
<tbody> <tbody>
<tr <tr
v-for="item in obj.contractPartOverrideItems" v-for="(item, index) in obj.contractPartOverrideItems"
:key="item.Id" :key="item.Id"
> >
<td class="text-right">{{ item.overridePct }}%</td> <td class="text-right">{{ item.overridePct }}%</td>
@@ -215,7 +215,7 @@
<v-btn <v-btn
large large
icon icon
@click="editContractPartOverrideItem(item)" @click="editContractPartOverrideItem(index)"
class="ml-4" class="ml-4"
> >
<v-icon small> <v-icon small>
@@ -256,7 +256,8 @@
<tbody> <tbody>
<tr <tr
v-for="item in obj.contractServiceRateOverrideItems" v-for="(item,
index) in obj.contractServiceRateOverrideItems"
:key="item.Id" :key="item.Id"
> >
<td class="text-right">{{ item.overridePct }}%</td> <td class="text-right">{{ item.overridePct }}%</td>
@@ -274,7 +275,7 @@
<v-btn <v-btn
large large
icon icon
@click="editContractServiceRateOverrideItem(item)" @click="editContractServiceRateOverrideItem(index)"
class="ml-4" class="ml-4"
> >
<v-icon small> <v-icon small>
@@ -315,7 +316,7 @@
<tbody> <tbody>
<tr <tr
v-for="item in obj.contractTravelRateOverrideItems" v-for="(item, index) in obj.contractTravelRateOverrideItems"
:key="item.Id" :key="item.Id"
> >
<td class="text-right">{{ item.overridePct }}%</td> <td class="text-right">{{ item.overridePct }}%</td>
@@ -333,7 +334,7 @@
<v-btn <v-btn
large large
icon icon
@click="editContractTravelRateOverrideItem(item)" @click="editContractTravelRateOverrideItem(index)"
class="ml-4" class="ml-4"
> >
<v-icon small> <v-icon small>
@@ -639,22 +640,10 @@
<v-btn <v-btn
color="red darken-1" color="red darken-1"
text text
@click=" @click="deleteContractPartOverrideItem()"
deleteContractPartOverrideItem(
obj.contractPartOverrideItems[
editContractPartOverrideItemIndex
]
)
"
>{{ $ay.t("Delete") }}</v-btn >{{ $ay.t("Delete") }}</v-btn
> >
<v-spacer></v-spacer> <v-spacer></v-spacer>
<v-btn
color="blue darken-1"
text
@click="editContractPartOverrideItemDialog = false"
>{{ $ay.t("Close") }}</v-btn
>
<v-btn <v-btn
color="blue darken-1" color="blue darken-1"
@@ -697,13 +686,7 @@
block block
text text
color="red darken-1" color="red darken-1"
@click=" @click="deleteContractPartOverrideItem()"
deleteContractPartOverrideItem(
obj.contractPartOverrideItems[
editContractPartOverrideItemIndex
]
)
"
>{{ $ay.t("Delete") }}</v-btn >{{ $ay.t("Delete") }}</v-btn
> >
</v-row> </v-row>
@@ -833,22 +816,10 @@
<v-btn <v-btn
color="red darken-1" color="red darken-1"
text text
@click=" @click="deleteContractServiceRateOverrideItem()"
deleteContractServiceRateOverrideItem(
obj.contractServiceRateOverrideItems[
editContractServiceRateOverrideItemIndex
]
)
"
>{{ $ay.t("Delete") }}</v-btn >{{ $ay.t("Delete") }}</v-btn
> >
<v-spacer></v-spacer> <v-spacer></v-spacer>
<v-btn
color="blue darken-1"
text
@click="editContractServiceRateOverrideItemDialog = false"
>{{ $ay.t("Close") }}</v-btn
>
<v-btn <v-btn
color="blue darken-1" color="blue darken-1"
@@ -891,13 +862,7 @@
block block
text text
color="red darken-1" color="red darken-1"
@click=" @click="deleteContractServiceRateOverrideItem()"
deleteContractServiceRateOverrideItem(
obj.contractServiceRateOverrideItems[
editContractServiceRateOverrideItemIndex
]
)
"
>{{ $ay.t("Delete") }}</v-btn >{{ $ay.t("Delete") }}</v-btn
> >
</v-row> </v-row>
@@ -1027,22 +992,10 @@
<v-btn <v-btn
color="red darken-1" color="red darken-1"
text text
@click=" @click="deleteContractTravelRateOverrideItem()"
deleteContractTravelRateOverrideItem(
obj.contractTravelRateOverrideItems[
editContractTravelRateOverrideItemIndex
]
)
"
>{{ $ay.t("Delete") }}</v-btn >{{ $ay.t("Delete") }}</v-btn
> >
<v-spacer></v-spacer> <v-spacer></v-spacer>
<v-btn
color="blue darken-1"
text
@click="editContractTravelRateOverrideItemDialog = false"
>{{ $ay.t("Close") }}</v-btn
>
<v-btn <v-btn
color="blue darken-1" color="blue darken-1"
@@ -1085,13 +1038,7 @@
block block
text text
color="red darken-1" color="red darken-1"
@click=" @click="deleteContractTravelRateOverrideItem()"
deleteContractTravelRateOverrideItem(
obj.contractTravelRateOverrideItems[
editContractTravelRateOverrideItemIndex
]
)
"
>{{ $ay.t("Delete") }}</v-btn >{{ $ay.t("Delete") }}</v-btn
> >
</v-row> </v-row>
@@ -1218,7 +1165,7 @@
</template> </template>
<!-- #########################################################################################################--> <!-- #########################################################################################################-->
<!-- ########################## SERVICE RATE ITEM EDIT FORM ###############################--> <!-- ########################## TRAVEL RATE ITEM EDIT FORM ###############################-->
<!-- #########################################################################################################--> <!-- #########################################################################################################-->
<template <template
v-if="obj.travelRateItems.length && editTravelRateItemIndex != -1" v-if="obj.travelRateItems.length && editTravelRateItemIndex != -1"
@@ -1490,10 +1437,8 @@ export default {
} }
}, },
methods: { methods: {
editContractPartOverrideItem: function(item) { editContractPartOverrideItem: function(index) {
this.editContractPartOverrideItemIndex = this.obj.contractPartOverrideItems.findIndex( this.editContractPartOverrideItemIndex = index;
z => z.id == item.id
);
if (this.editContractPartOverrideItemIndex != -1) { if (this.editContractPartOverrideItemIndex != -1) {
this.editContractPartOverrideItemDialog = true; this.editContractPartOverrideItemDialog = true;
} }
@@ -1522,10 +1467,8 @@ export default {
this.formState.dirty = true; this.formState.dirty = true;
}, },
editContractServiceRateOverrideItem: function(item) { editContractServiceRateOverrideItem: function(index) {
this.editContractServiceRateOverrideItemIndex = this.obj.contractServiceRateOverrideItems.findIndex( this.editContractServiceRateOverrideItemIndex = index;
z => z.id == item.id
);
if (this.editContractServiceRateOverrideItemIndex != -1) { if (this.editContractServiceRateOverrideItemIndex != -1) {
this.editContractServiceRateOverrideItemDialog = true; this.editContractServiceRateOverrideItemDialog = true;
} }
@@ -1554,10 +1497,8 @@ export default {
this.formState.dirty = true; this.formState.dirty = true;
}, },
editContractTravelRateOverrideItem: function(item) { editContractTravelRateOverrideItem: function(index) {
this.editContractTravelRateOverrideItemIndex = this.obj.contractTravelRateOverrideItems.findIndex( this.editContractTravelRateOverrideItemIndex = index;
z => z.id == item.id
);
if (this.editContractTravelRateOverrideItemIndex != -1) { if (this.editContractTravelRateOverrideItemIndex != -1) {
this.editContractTravelRateOverrideItemDialog = true; this.editContractTravelRateOverrideItemDialog = true;
} }