Small changes for showing summer date.

Author: arcshiftsolutions

frontend/src/components/graduation/district/upload/GradDistrictUploadDataComponent.vue

@@ -199,14 +199,14 @@
       </v-row>
     </div>
     <div v-else-if="hasRequiredPermission('GRAD_DIS_UPLOAD')">
-      <v-row v-if="isBetweenSchoolSummerPeriod">
+      <v-row v-if="isBeforeSummerSchoolPeriod">
         <v-col cols="12">
           <v-alert
             density="compact"
             type="info"
             variant="tonal"
           >
-            Uploads are unavailable, as the School Year Reporting Period is complete. The Summer Reporting Period will open in August.
+            Uploads are unavailable, as the School Year Reporting Period is complete. The Summer Reporting Period will open on {{ summerPeriodStart }}.
           </v-alert>
         </v-col>
       </v-row>
@@ -241,7 +241,7 @@
             color="#003366"
             text="Upload Graduation Data Files"
             :loading="isLoadingFiles"
-            :disabled="isBetweenSchoolSummerPeriod || isBetweenSummerSchoolPeriod"
+            :disabled="isBeforeSummerSchoolPeriod || isBetweenSummerSchoolPeriod"
             @click="handleFileImport"
           />
         </v-col>
@@ -371,38 +371,38 @@
                 <v-tooltip text="Files processed. Error report available.">
                   <template #activator="{ props: tooltipProps }">
                     <v-icon
-                    icon="mdi-check-circle-outline"
-                    v-bind="tooltipProps"
-                    color="success"
-                  />
+                      icon="mdi-check-circle-outline"
+                      v-bind="tooltipProps"
+                      color="success"
+                    />
                   </template>
                 </v-tooltip>
               </span>
               <span v-else-if="isFilesetInProgress(props.item)">
                 <v-tooltip text="Your files are in the processing queue. The number indicates your position. Processing will begin automatically — you don't need to stay on this screen.">
                   <template #activator="{ props: tooltipProps }">
                     <v-progress-circular
-                    :width="4"
-                    color="primary"
-                    v-bind="tooltipProps"
-                    indeterminate
-                  >
-                    <span style="color: rgb(0, 51, 102);">{{ props.item.positionInQueue ==='0' ? '' : props.item.positionInQueue }}</span>
-                  </v-progress-circular>
+                      :width="4"
+                      color="primary"
+                      v-bind="tooltipProps"
+                      indeterminate
+                    >
+                      <span style="color: rgb(0, 51, 102);">{{ props.item.positionInQueue ==='0' ? '' : props.item.positionInQueue }}</span>
+                    </v-progress-circular>
+                  </template>
+                </v-tooltip>
+              </span>
+              <span v-else>
+                <v-tooltip text="Missing files. Upload missing files to continue processing.">
+                  <template #activator="{ props: tooltipProps }">
+                    <v-icon
+                      icon="mdi-clock-alert-outline"
+                      v-bind="tooltipProps"
+                      color="warning"
+                    />
                   </template>
                 </v-tooltip>
               </span>
-                <span v-else>
-                  <v-tooltip text="Missing files. Upload missing files to continue processing.">
-                    <template #activator="{ props: tooltipProps }">
-                      <v-icon
-                        icon="mdi-clock-alert-outline"
-                        v-bind="tooltipProps"
-                        color="warning"
-                      />
-                    </template>
-                  </v-tooltip>
-                </span>
             </span>
             <span v-else-if="column.key === 'updateDate'">
               {{ props.item[column.key] ? props.item[column.key].substring(0,19).replaceAll('-', '/').replaceAll('T', ' ') : '-' }}
@@ -518,7 +518,10 @@
                     <v-col cols="9">
                       <span><b>{{ file.name }}</b> - {{ file.error }}</span>
                     </v-col>
-                    <v-col cols="2" class="d-flex justify-end">
+                    <v-col
+                      cols="2"
+                      class="d-flex justify-end"
+                    >
                       <ClipboardButton
                         id="copyErrorButton"
                         :copy-text="file.error"
@@ -637,7 +640,7 @@
       </v-card-actions>
     </v-card>
   </v-dialog>
-  <PreviewStudentsDialog ref="previewDialog"/>
+  <PreviewStudentsDialog ref="previewDialog" />
 </template>
 
 <script>
@@ -656,6 +659,7 @@ import GradSchoolCodeNameFilter from '../../GradSchoolCodeNameFilter.vue';
 import {LocalDateTime} from '@js-joda/core';
 import ClipboardButton from '../../../util/ClipboardButton.vue';
 import PreviewStudentsDialog from '../../PreviewStudentsDialog.vue';
+import {formatDate} from '../../../../utils/format';
 
 export default {
   name: 'GradDistrictUploadDataComponent',
@@ -710,8 +714,9 @@ export default {
       yearAfterNext: null,
       nextYear: null,
       isSummerPeriod: false,
-      isBetweenSchoolSummerPeriod: false,
+      isBeforeSummerSchoolPeriod: false,
       isBetweenSummerSchoolPeriod: false,
+      summerPeriodStart: '',
       pageNumber: 1,
       pageSize: 20,
       isLoading: false,
@@ -850,6 +855,7 @@ export default {
       this.successfulUploadCountXLS = 0;
       this.$refs.uploaderXLS.click();
     },
+    formatDate,
     isFilesetInProgress(fileset){
       return fileset.demFileName != null && fileset.crsFileName != null && fileset.xamFileName != null;
     },
@@ -873,11 +879,12 @@ export default {
       const schoolPeriodStart = LocalDateTime.parse(this.collectionObject.schYrStart);
       const schoolPeriodEnd = LocalDateTime.parse(this.collectionObject.schYrEnd);
 
+      this.summerPeriodStart = formatDate(summerPeriodStart.toString().substring(0, 10),'uuuu-MM-dd', 'uuuu/MM/dd');
       const today = LocalDateTime.now();
 
       this.isSummerPeriod = today.isAfter(summerPeriodStart) && today.isBefore(summerPeriodEnd);
       this.isBetweenSummerSchoolPeriod = (today.isBefore(schoolPeriodStart) && today.isBefore(summerPeriodStart)) || (today.isAfter(summerPeriodEnd) && today.isAfter(schoolPeriodEnd));
-      this.isBetweenSchoolSummerPeriod = today.isAfter(schoolPeriodEnd) && today.isBefore(summerPeriodStart);
+      this.isBeforeSummerSchoolPeriod = today.isAfter(schoolPeriodEnd) && today.isBefore(summerPeriodStart);
     },
     async importFileXLS() {
       if(this.uploadFileValueXLS.length > 0) {

frontend/src/components/graduation/school/upload/GradSchoolUploadDataComponent.vue

@@ -218,14 +218,14 @@
         </v-row>
       </div>
       <div v-else-if="hasRequiredPermission('GRAD_SCH_UPLOAD')">
-        <v-row v-if="isBetweenSchoolSummerPeriod">
+        <v-row v-if="isBeforeSummerSchoolPeriod">
           <v-col cols="12">
             <v-alert
               density="compact"
               type="info"
               variant="tonal"
             >
-              Uploads are unavailable, as the School Year Reporting Period is complete. The Summer Reporting Period will open in August.
+              Uploads are unavailable, as the School Year Reporting Period is complete. The Summer Reporting Period will open on {{ summerPeriodStart }}.
             </v-alert>
           </v-col>
         </v-row>
@@ -260,7 +260,7 @@
               color="#003366"
               text="Upload Graduation Data Files"
               :loading="isLoadingFiles"
-              :disabled="isBetweenSchoolSummerPeriod || isBetweenSummerSchoolPeriod"
+              :disabled="isBeforeSummerSchoolPeriod || isBetweenSummerSchoolPeriod"
               @click="handleFileImport"
             />
           </v-col>
@@ -667,6 +667,7 @@ import {appStore} from '../../../../store/modules/app';
 import {LocalDateTime} from '@js-joda/core';
 import ClipboardButton from '../../../util/ClipboardButton.vue';
 import PreviewStudentsDialog from '../../PreviewStudentsDialog.vue';
+import {formatDate} from '../../../../utils/format';
   
 export default {
   name: 'GradSchoolUploadDataComponent',
@@ -690,6 +691,7 @@ export default {
   emits: [],
   data() {
     return {
+      summerPeriodStart: '',
       acceptableFileExtensions: ['.xam', '.dem', '.crs'],
       acceptableXLSFileExtensions: ['.xlsx'],
       requiredRules: [v => !!v || 'Required'],
@@ -718,7 +720,7 @@ export default {
       fileUploadList: [],
       progressCounts: [],
       isSummerPeriod: false,
-      isBetweenSchoolSummerPeriod: false,
+      isBeforeSummerSchoolPeriod: false,
       isBetweenSummerSchoolPeriod: false,
       filesetList: [],
       totalElements: 0,
@@ -824,6 +826,7 @@ export default {
       this.yearAfterNext = reportingPeriodStart.plusYears(2).year();
       this.setPeriodFlags();
     },
+    formatDate,
     getGradSchoolDetails() {
       ApiService.apiAxios.get(ApiRoutes.gdc.BASE_URL + '/school/' + this.schoolID + '/grad-school')
         .then(response => {
@@ -836,11 +839,12 @@ export default {
       const schoolPeriodStart = LocalDateTime.parse(this.collectionObject.schYrStart);
       const schoolPeriodEnd = LocalDateTime.parse(this.collectionObject.schYrEnd);
 
+      this.summerPeriodStart = formatDate(summerPeriodStart.toString().substring(0, 10),'uuuu-MM-dd', 'uuuu/MM/dd');
       const today = LocalDateTime.now();
 
       this.isSummerPeriod = today.isAfter(summerPeriodStart) && today.isBefore(summerPeriodEnd);
       this.isBetweenSummerSchoolPeriod = (today.isBefore(schoolPeriodStart) && today.isBefore(summerPeriodStart)) || (today.isAfter(summerPeriodEnd) && today.isAfter(schoolPeriodEnd));
-      this.isBetweenSchoolSummerPeriod = today.isAfter(schoolPeriodEnd) && today.isBefore(summerPeriodStart);
+      this.isBeforeSummerSchoolPeriod = today.isAfter(schoolPeriodEnd) && today.isBefore(summerPeriodStart);
     },
     toggleMoreInfoTooltip(){
       this.showMoreInfoTooltip = !this.showMoreInfoTooltip;