Merge pull request #166 from UTDallasEPICS/rajSimalArchive

Merging stage fixes into archive
UTDallasEPICS · Apr 24, 2024 · 9cf3398 · 9cf3398
2 parents cf6c235 + 20e0538
commit 9cf3398
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/pages/FamilyReports.vue b/pages/FamilyReports.vue
@@ -45,17 +45,17 @@ div
     //.py-4.grid(class="sm:grid-cols-5") 
             CVLabel Date Range
             .col-md-8.mx-9(class="sm:col-span-1 sm:mr-11")
-            CVLabel Date Range
-            .col-md-8.mx-9(class="sm:col-span-2 sm:mr-11")
               CVDatepicker(v-model='start_date' @update:model-value="currentPage=0; loadReports();")
-            .col-md-8.mx-9(class="sm:col-span-1 sm:mr-11")  
+            .col-md-8.mx-9(class="sm:col-span-1 sm:mr-9")  
               p(style="text-align:center;") {{ "-" }}
-            .col-md-8.mx-9(class="sm:col-span-2 sm:mr-11")  
+            .col-md-8.mx-9(class="sm:col-span-2 sm:mr-9")  
               CVDatepicker(v-model='end_date' @update:modelValue="currentPage=0; loadReports()" )  
             .col-md-8.mx-9(class="sm:col-span-1 sm:mr-11")
-                    
+            a.mr-2.mt-1.p-2.px-6.pt-3.pb-3.bg-orange-999(class="transition duration-300 bg-orange-999 hover:bg-green-600" style="border-radius: 100px; height: 50px; color: white; font-weight: 700;" :href="filedownloadlink" :download="downloadName" :dataset.downloadurl="dataset") Download        
+            a.mr-2.mt-1.p-2.px-9.pt-3.pb-3.bg-orange-999(class="transition duration-300 bg-orange-999 hover:bg-green-600" style="border-radius: 100px; height: 50px; color: white; font-weight: 700;") Archive        
     .flex.gap-2.justify-center.cols-2.pl-6.pr-6
       a.mr-9.mt-1.p-6.px-6.pr-6.pt-3.pb-3.bg-orange-999(class="transition duration-300 bg-orange-999 hover:bg-green-600" style="border-radius: 100px; height: 50px; color: white; font-weight: 700;" :href="filedownloadlink" :download="downloadName" :dataset.downloadurl="dataset") Download
+      a.mr-2.mt-1.p-2.px-9.pt-3.pb-3.bg-orange-999(class="transition duration-300 bg-orange-999 hover:bg-green-600" style="border-radius: 100px; height: 50px; color: white; font-weight: 700;") Archive
       table(style="margin-top: 1.25rem; width: 100%; border-spacing: 0; border-collapse: collapse;" v-if="isAdminAdvocate")
           thead(style="color: white;")
               tr
@@ -359,8 +359,10 @@ div
             body: { ...page }
           })
     }
+
   }
     
+
 // Pagination control, move the page counter forwards and backwards and searches
 const nextPage = () => { 
   console.log(totalLength.value / dimensions.value)

diff --git a/pages/PageList/[id].vue b/pages/PageList/[id].vue
@@ -194,6 +194,7 @@ const prevPage = () => {
 }
 const currentFamily = computed(() => data_families.value?.find(({ cuid }: Family) => cuid == familyCuid.value) || {});
 
+
 await getDataPageList()
 </script>
 
@@ -203,7 +204,12 @@ await getDataPageList()
     .col-md-8.mx-9(class="sm:col-span-2 sm:mr-11")
       Listbox.shadow-sm.border.border-1.rounded-lg(v-if="isAdmin || isAdvocate" as='div' v-model="familyCuid")
         .relative
-          Transition(
+  .py-4.grid(class="sm:grid-cols-3" v-if="isAdvocate && !fromUser")
+      CVLabel Family
+      .col-md-8.mx-9(class="sm:col-span-2 sm:mr-11")
+        Listbox.shadow-sm.border.border-1.rounded-lg(v-if="isAdmin || isAdvocate" as='div' v-model="familyCuid")
+          .relative
+            Transition(
                     leave-active-class='transition ease-in duration-100'
                     leave-from-class='opacity-100'
                     leave-to-class='opacity-0'
@@ -243,8 +249,7 @@ await getDataPageList()
           LinkButton(class="sm:my-2 transition duration-300 bg-orange-999 hover:bg-green-600" style="--tw-bg-opacity: 1; white-space: nowrap; display: flex; flex-direction: row; padding: 14px 24px; gap: 10px;" :to="`/EditPage/${item.cuid}`") Edit
         td
           LinkButton(class="sm:my-2 transition duration-300 bg-orange-999 hover:bg-green-600" style="--tw-bg-opacity: 1; white-space: nowrap; display: flex; flex-direction: row; padding: 14px 24px; gap: 10px;" :to="`/Page/${item.cuid}`") View
-  .container.bg-blue-300.mx-auto(class="w-auto sm:w-[1200px]" style="--tw-bg-opacity: 1; background-color: #5aadc2; height: 50px; border-radius: 0px 0px 60px 60px;")
-.mb-9.py-7.flex.flex-wrap.gap-2.place-content-center
+          .container.bg-blue-300.mx-auto.mt-4(class="w-auto sm:w-[1200px]" style="--tw-bg-opacity: 1; background-color: #5aadc2; height: 50px; border-radius: 0px 0px 60px 60px;").mb-9.py-7.flex.flex-wrap.gap-2.place-content-center
   .col-md-10.px-2.mt-2
       button(@click="prevPage") &lt
   .col-md-10.px-2.mt-2