Merge pull request #306 from ncosd/dev

Release 1.18.0

web/admin/src/components/AdminCalendarScheduler.vue

@@ -123,7 +123,6 @@ function isoDate(date) {
 
 
 const windowColor = (win) => {
-  console.log('windowColor(win)=', win.tasktype, win)
   if (win.tasktype === 'Holiday') {
     return 'text-bg-holiday'
   }

web/admin/src/components/AppNavigation.vue

@@ -41,7 +41,7 @@ const signOutClick = () => {
               <router-link class="nav-link" :to="{ name: 'DeliveryDashboard' }">Delivery</router-link>
             </li>
             <li class="nav-item">
-              <router-link class="nav-link" :to="{ name: 'LocationsList' }">Config</router-link>
+              <router-link class="nav-link" :to="{ name: 'LocationsList' }">Settings</router-link>
             </li>
             <!-- <li class="nav-item"> -->
             <!--   <router-link class="nav-link" :to="{ name: 'LocationsList' }">Locations</router-link> -->

web/admin/src/config.js

@@ -1,5 +1,5 @@
 export let config = {
-  version: "1.17.0",
+  version: "1.18.0",
   adminAppNavName: import.meta.env.VITE_ADMIN_APP_NAV_NAME || 'ADMIN_APP_NAV_NAME',
   adminAppNavImg: import.meta.env.VITE_ADMIN_APP_NAV_IMG || null,
   appNavName: import.meta.env.VITE_APP_NAV_NAME || 'APP_NAV_NAME',

web/admin/src/pages/LocationsListPage.vue

@@ -59,7 +59,7 @@ const mapsquery = (loc)=>{
           </tr>
         </thead>
         <tbody>
-          <tr v-for="loc in locations">
+          <tr v-for="loc in locations" :key="loc.name">
             <td>{{loc.name}}</td>
             <td>{{loc.displayname}}</td>
             <td>{{loc.street}}</td>

web/admin/src/pages/ReleaseNotesPage.vue

@@ -5,6 +5,11 @@
 <template>
 <div class="container">
   <h1>Release Notes</h1>
+  <h2 id="1.18.0">February 19, 2024 - 1.18.0</h2>
+  <ul>
+    <li>Show all volunteers by default on the volunteer list page.</li>
+    <li><a href="https://github.com/ncosd/food-pantry-app/issues/285">#285</a> Added fix for key when looping over lists.</li>
+  </ul>
   <h2 id="1.17.0">February 7, 2024 - 1.17.0</h2>
   <ul>
     <li><a href="https://github.com/ncosd/food-pantry-app/issues/203">#203</a> Check for attending volunteer windows when choosing unavailable date</li>

web/admin/src/pages/ScheduleWindowPage.vue

@@ -136,7 +136,7 @@ const deleteWindow = async () => {
         <div class="col">
           <label class="form-label" for="location">Location</label>
           <select id="location" class="form-select" v-model="windowEntry.location">
-            <option v-for="loc in locations" :value="loc.name">{{ loc.name }}</option>
+            <option v-for="loc in locations" :value="loc.name" :key="loc.name">{{ loc.name }}</option>
           </select>
         </div>
       </div>
@@ -145,7 +145,7 @@ const deleteWindow = async () => {
         <div class="col">
           <label class="form-label" for="tasktype">Task Type</label>
           <select id="tasktype" class="form-select" v-model="windowEntry.tasktype">
-            <option v-for="tt in tasks" :value="tt.name">{{ tt.name }}</option>
+            <option v-for="tt in tasks" :value="tt.name" :key="tt.name">{{ tt.name }}</option>
           </select>
         </div>
       </div>
@@ -197,7 +197,7 @@ const deleteWindow = async () => {
     <div v-if="attending.length > 0">
       <h2>Attending</h2>
       <ol>
-        <li v-for="item in attending"><router-link :to="{name:'Profile', params: { 'uid': item.id}}">{{ item.name }}</router-link></li>
+        <li v-for="item in attending" :key="item.id"><router-link :to="{name:'Profile', params: { 'uid': item.id}}">{{ item.name }}</router-link></li>
       </ol>
     </div>
     <div v-else>

web/admin/src/pages/TaskTypesListPage.vue

@@ -36,7 +36,7 @@ onBeforeMount( async () => {
           </tr>
         </thead>
         <tbody>
-          <tr v-for="tt in tasktypes">
+          <tr v-for="tt in tasktypes" :key="tt.name">
             <td>{{tt.name}}</td>
             <td>{{tt.displayname}}</td>
             <td>{{tt.description}}</td>

web/admin/src/pages/UnavailablePage.vue

@@ -145,7 +145,7 @@ const saveUnavail = (async () => {
   </thead>
   <tbody>
     <template v-if="unavailList && unavailList.docs.length > 0">
-    <tr v-for="u in unavailList.docs">
+    <tr v-for="u in unavailList.docs" :key="u.id">
       <td>{{dayjs(u.data().startDate.toDate()).format('MM/DD/YYYY')}}</td>
       <td>{{dayjs(u.data().endDate.toDate()).format('MM/DD/YYYY')}}</td>
       <td>

web/admin/src/pages/VolunteersPage.vue

@@ -4,7 +4,7 @@ import VolunteerList from "@/components/VolunteerList.vue"
 import { collection, getFirestore, query, where, getDocs, orderBy } from "firebase/firestore"
 
 const volunteers = ref()
-const statusFilter = ref("in-review")
+const statusFilter = ref("all")
 const sortBy = ref("firstname")
 const sortAsc = ref(true)
 const driverFilter = ref(false)
@@ -13,7 +13,10 @@ const approvedDriverFilter = ref(false)
 const refreshList = async () => {
   const db = getFirestore()
   const volunteerCollection = collection(db, "volunteerprofilestate")
-  let q = query(volunteerCollection, where("status", "==", statusFilter.value), orderBy(sortBy.value, sortAsc.value ? "asc" : "desc"))
+  let q = query(volunteerCollection, orderBy(sortBy.value, sortAsc.value ? "asc" : "desc"))
+  if (statusFilter.value != 'all') {
+    q = query(q, where("status", "==", statusFilter.value))
+  }
 
   if (driverFilter.value) {
     q = query(q, where('isDriver', '==', true))
@@ -62,6 +65,7 @@ onBeforeMount(async () => {
       <div class="col">
         <label class="col-form-label" for="statusFilter">Status</label>
         <select class="form-select" id="statusFilter" v-model="statusFilter" @change="refreshList">
+          <option value="all">All</option>
           <option value="in-review">in-review</option>
           <option value="active">active</option>
           <option value="inactive">inactive</option>

web/admin/src/pages/orders/OrderFormPage.vue

@@ -98,16 +98,16 @@ const onRemoveOrder = (ev) => {
     <div v-if="showSaveMessage" class="text-bg-success">{{saveMessage}}</div>
     <div v-if="showErrMessage" class="text-bg-danger">{{errMessage}}</div>
 
-    <div class="row mb-3">
+    <div class="row my-3">
       <div class="col">
-        <label class="form-label" for="beginDate">Begin Date</label>
+        <label class="form-label" for="beginDate">Date and time Order form opens</label>
         <input id="beginDate" type="text" class="form-control" v-model="orderForm.beginDate" required>
       </div>
     </div>
 
     <div class="row mb-3">
       <div class="col">
-        <label class="form-label" for="endDate">End Date</label>
+        <label class="form-label" for="endDate">Date and time order form closes</label>
         <input id="endDate" type="text" class="form-control" v-model="orderForm.endDate" required>
       </div>
     </div>
@@ -122,33 +122,38 @@ const onRemoveOrder = (ev) => {
     <div class="row mb-3">
       <div class="col">
         <div class="py-3">Choose Items</div>
-        <div class="d-flex gap-5">
-          <VueDraggable v-model="orderForm.items"
-                        class="d-flex flex-column border w-50"
-                        group="items"
-                        style="min-height:200px;"
-                        @add="onAddOrder"
-                        @remove="onRemoveOrder"
-                        >
+        <div class="d-flex ">
+          <div class="d-flex col-6 flex-column">
+            <div>On Form</div>
+            <VueDraggable v-model="orderForm.items"
+                          class="d-flex flex-column border w-75"
+                          group="items"
+                          style="min-height:200px;"
+                          @add="onAddOrder"
+                          @remove="onRemoveOrder"
+                          >
               <div v-for="item in orderForm.items" :key="item.id" class="border border-1 p-2">
                 {{ item.name }} - {{ item.num }}
               </div>
             </VueDraggable>
-            <VueDraggable v-model="items" group="items" class="d-flex flex-column w-50 border" >
+          </div>
+          <div class="d-flex col-6 flex-column">
+            <div>Inventory</div>
+            <VueDraggable v-model="items" group="items" class="d-flex flex-column w-75 border"
+                          style="min-height:200px;">
               <div v-for="item in items" :key="item.id" class="border border-1 p-2">
                 {{ item.name }} - {{ item.num }}
               </div>
             </VueDraggable>
+          </div>
         </div>
-
       </div>
     </div>
 
 
     <div class="row mb-3">
       <div class="col">
         <div class="py-3">Item Limits</div>
-
         <div class="table-responsive-md">
           <table class="table table-striped table-hover">
             <thead>
@@ -159,6 +164,11 @@ const onRemoveOrder = (ev) => {
               </tr>
             </thead>
             <tbody>
+              <tr v-for="i in orderForm.items" :key="i.id">
+                <td>{{i.name}}</td>
+                <td><input type="text" v-model="i.num" /></td>
+                <td><input type="text" v-model="i.maxTotal" /></td>
+              </tr>
               <tr v-for="i in items" :key="i.id">
                 <td>{{i.name}}</td>
                 <td><input type="text" v-model="i.num" /></td>

web/app/src/config.js

@@ -1,5 +1,5 @@
 export let config = {
-  version: "1.17.0",
+  version: "1.18.0",
   appNavName: import.meta.env.VITE_APP_NAV_NAME || "APP_NAV_NAME",
   appNavImg: import.meta.env.VITE_APP_NAV_IMG || null,
   OrganizationName: import.meta.env.VITE_ORGANIZATION_NAME || "ORGANIZATION_NAME",

web/app/src/pages/ReleaseNotesPage.vue

@@ -5,6 +5,10 @@
 <template>
 <div class="container">
   <h1>Release Notes</h1>
+  <h2 id="1.18.0">February 19, 2024 - 1.18.0</h2>
+  <ul>
+    <li>No issues.</li>
+  </ul>
   <h2 id="1.17.0">February 7, 2024 - 1.17.0</h2>
   <ul>
     <li>No issues in the Guest app.</li>