Skip to content

Commit

Permalink
Merge pull request #353 from amansinghbais/345-progress-bar-green
Browse files Browse the repository at this point in the history
Improved: made progress bar green when receiving complete (#345)
  • Loading branch information
ravilodhi authored Mar 8, 2024
2 parents 72d29e5 + 8d2f0ad commit 014ceec
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/views/PurchaseOrderDetail.vue
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@

<div class="qty-progress">
<!-- TODO: improve the handling of quantityAccepted -->
<ion-progress-bar :color="getRcvdToOrderedFraction(item) > 1 ? 'danger' : 'primary'" :value="getRcvdToOrderedFraction(item)" />
<ion-progress-bar :color="getRcvdToOrderedFraction(item) === 1 ? 'success' : getRcvdToOrderedFraction(item) > 1 ? 'danger' : 'primary'" :value="getRcvdToOrderedFraction(item)" />
</div>

<div class="po-item-history">
Expand Down
2 changes: 1 addition & 1 deletion src/views/ReturnDetails.vue
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<ion-button v-if="isReturnReceivable(current.statusId)" @click="receiveAll(item)" slot="start" fill="outline">
{{ translate("Receive All") }}
</ion-button>
<ion-progress-bar :color="getRcvdToOrdrdFraction(item) > 1 ? 'danger' : 'primary'" :value="getRcvdToOrdrdFraction(item)" />
<ion-progress-bar :color="getRcvdToOrdrdFraction(item) === 1 ? 'success' : getRcvdToOrdrdFraction(item) > 1 ? 'danger' : 'primary'" :value="getRcvdToOrdrdFraction(item)" />
<p slot="end">{{ item.quantityOrdered }} {{ translate("returned") }}</p>
</ion-item>
</ion-card>
Expand Down
2 changes: 1 addition & 1 deletion src/views/ShipmentDetails.vue
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
{{ translate("Receive All") }}
</ion-button>

<ion-progress-bar :color="getRcvdToOrdrdFraction(item) > 1 ? 'danger' : 'primary'" :value="getRcvdToOrdrdFraction(item)" />
<ion-progress-bar :color="getRcvdToOrdrdFraction(item) === 1 ? 'success' : getRcvdToOrdrdFraction(item) > 1 ? 'danger' : 'primary'" :value="getRcvdToOrdrdFraction(item)" />

<p slot="end">{{ item.quantityOrdered }} {{ translate("shipped") }}</p>
</ion-item>
Expand Down

0 comments on commit 014ceec

Please sign in to comment.