Browse Source

add note about confirming your own, plus other helpful verbiage, plus notify messages that don't linger

pull/115/head
Trent Larson 7 months ago
parent
commit
c5102f89b5
  1. 2
      src/views/GiftedDetails.vue
  2. 10
      src/views/QuickActionBvcBeginView.vue
  3. 12
      src/views/QuickActionBvcEndView.vue

2
src/views/GiftedDetails.vue

@ -217,7 +217,7 @@ export default class GiftedDetails extends Vue {
); );
console.log("Got project name from cache", project); console.log("Got project name from cache", project);
this.projectName = project?.name this.projectName = project?.name
? "the project " + project.name ? "the project: " + project.name
: "a project"; : "a project";
} }
} }

10
src/views/QuickActionBvcBeginView.vue

@ -153,7 +153,7 @@ export default class QuickActionBvcBeginView extends Vue {
timeResult?.error?.userMessage || timeResult?.error?.userMessage ||
"There was an error sending the time.", "There was an error sending the time.",
}, },
-1, 5000,
); );
} }
} }
@ -180,7 +180,7 @@ export default class QuickActionBvcBeginView extends Vue {
attendResult?.error?.userMessage || attendResult?.error?.userMessage ||
"There was an error sending the attendance.", "There was an error sending the attendance.",
}, },
-1, 5000,
); );
} }
} }
@ -199,7 +199,7 @@ export default class QuickActionBvcBeginView extends Vue {
title: "Success", title: "Success",
text: actions, text: actions,
}, },
-1, 3000,
); );
} }
@ -211,9 +211,9 @@ export default class QuickActionBvcBeginView extends Vue {
group: "alert", group: "alert",
type: "danger", type: "danger",
title: "Error", title: "Error",
text: error.userMessage || "There was an error sending claims.", text: error.userMessage || "There was an error sending the claims.",
}, },
-1, 5000,
); );
} }
} }

12
src/views/QuickActionBvcEndView.vue

@ -82,6 +82,16 @@
page. page.
</span> </span>
</div> </div>
<div v-if="claimCountByUser > 0" class="border-b border-slate-300 pb-2">
<span>
{{
claimCountByUser === 1
? "There is 1 other claim by you"
: `There are ${claimCountByUser} other claims by you`
}}
which you don't need to confirm.
</span>
</div>
<div> <div>
<h2 class="text-2xl m-2">Anything else?</h2> <h2 class="text-2xl m-2">Anything else?</h2>
@ -165,6 +175,7 @@ export default class QuickActionBvcBeginView extends Vue {
allContacts: Array<Contact> = []; allContacts: Array<Contact> = [];
allMyDids: Array<string> = []; allMyDids: Array<string> = [];
apiServer = ""; apiServer = "";
claimCountByUser = 0;
claimCountWithHidden = 0; claimCountWithHidden = 0;
claimsToConfirm: GenericCredWrapper[] = []; claimsToConfirm: GenericCredWrapper[] = [];
claimsToConfirmSelected: string[] = []; claimsToConfirmSelected: string[] = [];
@ -236,6 +247,7 @@ export default class QuickActionBvcBeginView extends Vue {
dataByOthers, dataByOthers,
); );
this.claimsToConfirm = dataByOthersWithoutHidden; this.claimsToConfirm = dataByOthersWithoutHidden;
this.claimCountByUser = data.length - dataByOthers.length;
this.claimCountWithHidden = this.claimCountWithHidden =
dataByOthers.length - dataByOthersWithoutHidden.length; dataByOthers.length - dataByOthersWithoutHidden.length;
}); });

Loading…
Cancel
Save