Various updates per review/feedback

bcgov · May 14, 2024 · 6d286aa · 6d286aa
1 parent 58babb3
commit 6d286aa
Show file tree

Hide file tree

Showing 8 changed files with 166 additions and 50 deletions.
diff --git a/app/src/components/constants.ts b/app/src/components/constants.ts
@@ -61,6 +61,12 @@ export const PERMIT_NEEDED = Object.freeze({
   NO: 'No'
 });
 
+export const PERMIT_STATUS = Object.freeze({
+  NEW: 'New',
+  APPLIED: 'Applied',
+  COMPLETED: 'Completed'
+});
+
 /** Types of notes */
 export const NOTE_TYPE_LIST = Object.freeze({
   GENERAL: 'General',

diff --git a/app/src/controllers/submission.ts b/app/src/controllers/submission.ts
@@ -5,6 +5,7 @@ import {
   APPLICATION_STATUS_LIST,
   INTAKE_STATUS_LIST,
   PERMIT_NEEDED,
+  PERMIT_STATUS,
   YesNo,
   YesNoUnsure
 } from '../components/constants';
@@ -221,6 +222,7 @@ const controller = {
 
       if (data.location) {
         location = {
+          naturalDisaster: data.location.naturalDisaster,
           projectLocation: data.location.projectLocation,
           locationPIDs: data.location.ltsaPIDLookup,
           latitude: data.location.latitude,
@@ -244,7 +246,7 @@ const controller = {
           permitTypeId: x.permitTypeId,
           activityId: newActivityId,
           trackingId: x.trackingId,
-          status: x.status,
+          status: PERMIT_STATUS.APPLIED,
           statusLastVerified: x.statusLastVerified
         }));
       }

diff --git a/app/tests/unit/controllers/submission.spec.ts b/app/tests/unit/controllers/submission.spec.ts
@@ -494,13 +494,13 @@ describe('createSubmission', () => {
           {
             permitTypeId: 1,
             trackingId: '123',
-            status: 'New',
+            status: 'Applied',
             statusLastVerified: now
           },
           {
             permitTypeId: 3,
             trackingId: '456',
-            status: 'New',
+            status: 'Applied',
             statusLastVerified: now
           }
         ],
@@ -533,7 +533,7 @@ describe('createSubmission', () => {
         permitTypeId: 1,
         activityId: expect.any(String),
         trackingId: '123',
-        status: 'New',
+        status: 'Applied',
         statusLastVerified: now
       })
     );
@@ -543,7 +543,7 @@ describe('createSubmission', () => {
         permitTypeId: 3,
         activityId: expect.any(String),
         trackingId: '456',
-        status: 'New',
+        status: 'Applied',
         statusLastVerified: now
       })
     );

diff --git a/frontend/src/assets/main.scss b/frontend/src/assets/main.scss
@@ -159,7 +159,7 @@ label {
 }
 
 .p-checkbox.p-highlight .p-checkbox-box,
-.p-radiobutton-checked .p-radiobutton-box,
+.p-radiobutton.p-highlight .p-radiobutton-box,
 .p-inputswitch-checked .p-inputswitch-slider:not(.p-disabled) {
   background: $app-primary;
   border-color: $app-primary;

diff --git a/frontend/src/components/form/InputText.vue b/frontend/src/components/form/InputText.vue
@@ -1,9 +1,12 @@
 <script setup lang="ts">
 import { ErrorMessage } from 'vee-validate';
+import { ref } from 'vue';
 
 import InputTextInternal from './internal/InputTextInternal.vue';
 import { FloatLabel } from '@/lib/primevue';
 
+import type { Ref } from 'vue';
+
 // Props
 type Props = {
   helpText?: string;
@@ -24,6 +27,9 @@ const props = withDefaults(defineProps<Props>(), {
   floatLabel: false,
   bold: true
 });
+
+// State
+const fieldActive: Ref<boolean> = ref(false);
 </script>
 
 <template>
@@ -36,10 +42,16 @@ const props = withDefaults(defineProps<Props>(), {
     </FloatLabel>
     <InputTextInternal
       v-else
+      v-model:fieldActive="fieldActive"
       v-bind="props"
     />
 
-    <small :id="`${name}-help`">{{ helpText }}</small>
+    <small
+      v-if="fieldActive"
+      :id="`${name}-help`"
+    >
+      {{ helpText }}
+    </small>
     <div>
       <ErrorMessage :name="name" />
     </div>

diff --git a/frontend/src/components/form/RadioList.vue b/frontend/src/components/form/RadioList.vue
@@ -52,12 +52,12 @@ watch(value, () => {
             :class="{ 'p-invalid': errorMessage }"
             :disabled="disabled"
           />
-          <label
+          <span
             :for="option"
             class="ml-2 mb-0"
           >
             {{ option }}
-          </label>
+          </span>
         </div>
       </div>
     </div>

diff --git a/frontend/src/components/form/internal/InputTextInternal.vue b/frontend/src/components/form/internal/InputTextInternal.vue
@@ -1,9 +1,11 @@
 <script setup lang="ts">
-import { toRef } from 'vue';
+import { toRef, ref } from 'vue';
 import { useField } from 'vee-validate';
 
 import { InputText } from '@/lib/primevue';
 
+import type { Ref } from 'vue';
+
 // Props
 type Props = {
   helpText: string;
@@ -17,7 +19,9 @@ type Props = {
 
 const props = withDefaults(defineProps<Props>(), {});
 
+// State
 const { errorMessage, value } = useField<string>(toRef(props, 'name'));
+const fieldActive = defineModel<boolean>('fieldActive');
 </script>
 
 <template>
@@ -35,5 +39,7 @@ const { errorMessage, value } = useField<string>(toRef(props, 'name'));
     class="w-full"
     :class="{ 'p-invalid': errorMessage }"
     :disabled="disabled"
+    @focus="fieldActive = true"
+    @blur="fieldActive = false"
   />
 </template>