@dative-gpi/foundation-shared-components 1.0.66 → 1.0.67-map-carousel

package/components/fields/FSCommentField.vue

@@ -5,9 +5,10 @@
     >
       <FSImage
         :imageId="userImageId"
-        :width="32"
-        :height="32"
+        width="32px"
+        height="32px"
         rounded="circle"
+        :thumbnail="true"
       />
       <FSTextArea
         :rows="5"
@@ -17,18 +18,21 @@
       />
     </FSRow>
     <FSRow>
-      <v-spacer></v-spacer>
-      <FSButtonCancel
-        v-if="showCancelButton"
-        @click="$emit('cancel')"
-      />
-      <FSButton
-        :color="ColorEnum.Primary"
-        :loading="creating"
-        prependIcon="mdi-send-outline"
-        :label="buttonLabel ?? $tr('ui.common.publish','Publish')"
-        @click="() => $emit('submit', innertext)"
-      />
+      <FSRow 
+        align="center-right"
+      >
+        <FSButtonCancel
+          v-if="showCancelButton"
+          @click="$emit('cancel')"
+        />
+        <FSButton
+          prependIcon="mdi-send-outline"
+          :color="ColorEnum.Primary"
+          :loading="creating"
+          :label="buttonLabel ?? $tr('ui.common.publish','Publish')"
+          @click="onSubmit"
+        />
+      </FSRow>
     </FSRow>
   </FSCol>
 </template>
@@ -80,13 +84,21 @@ export default defineComponent({
     },
   },
   emits: ["submit","cancel"],
-  setup(props) {
+  setup(props, { emit }) {
 
     const innertext = ref<string | undefined>(props.text);
+
+    const onSubmit = () => {
+      if (innertext.value) {
+        emit('submit', innertext.value);
+        innertext.value = '';
+      }
+    };
     
     return {
       innertext,
-      ColorEnum
+      ColorEnum,
+      onSubmit,
     };
   },
 })

package/components/fields/FSDateField.vue

@@ -10,7 +10,7 @@
         :color="$props.color"
         :hideHeader="$props.hideHeader"
         :required="$props.required"
-        :editable="$props.editable"
+        :disabled="$props.disabled"
         :readonly="true"
         :rules="$props.rules"
         :messages="messages"
@@ -29,7 +29,7 @@
             <FSButton
               variant="icon"
               icon="mdi-calendar"
-              :editable="$props.editable"
+              :disabled="$props.disabled"
               :color="ColorEnum.Dark"
               @click="openMobileOverlay"
             />
@@ -71,9 +71,10 @@
     <template
       v-else
     >
-      <v-menu
+      <FSMenu
+        min-width="300px"
         :closeOnContentClick="false"
-        :modelValue="menu && $props.editable"
+        :modelValue="menu && !$props.disabled"
         @update:modelValue="menu = $event"
       >
         <template
@@ -86,7 +87,7 @@
             :color="$props.color"
             :hideHeader="$props.hideHeader"
             :required="$props.required"
-            :editable="$props.editable"
+            :disabled="$props.disabled"
             :readonly="true"
             :rules="$props.rules"
             :messages="messages"
@@ -105,7 +106,7 @@
                 <FSButton
                   variant="icon"
                   icon="mdi-calendar"
-                  :editable="$props.editable"
+                  :disabled="$props.disabled"
                   :color="ColorEnum.Dark"
                 />
               </slot>
@@ -141,7 +142,7 @@
             />
           </FSCol>
         </FSCard>
-      </v-menu>
+      </FSMenu>
     </template>
   </FSCol>
 </template>
@@ -159,6 +160,7 @@ import FSTextField from "./FSTextField.vue";
 import FSCalendar from "../FSCalendar.vue";
 import FSButton from "../FSButton.vue";
 import FSCard from "../FSCard.vue";
+import FSMenu from '../FSMenu.vue';
 import FSCol from "../FSCol.vue";
 
 export default defineComponent({
@@ -169,6 +171,7 @@ export default defineComponent({
     FSCalendar,
     FSButton,
     FSCard,
+    FSMenu,
     FSCol
   },
   props: {
@@ -207,10 +210,10 @@ export default defineComponent({
       required: false,
       default: () => []
     },
-    editable: {
+    disabled: {
       type: Boolean,
       required: false,
-      default: true
+      default: false
     }
   },
   emits: ["update:modelValue"],
@@ -227,7 +230,7 @@ export default defineComponent({
     const messages = computed((): string[] => getMessages(props.modelValue, props.rules));
 
     const openMobileOverlay = () => {
-      if (!props.editable) {
+      if (props.disabled) {
         return;
       }
       dialog.value = true;

package/components/fields/FSDateRangeField.vue

@@ -6,7 +6,7 @@
     :color="$props.color"
     :hideHeader="$props.hideHeader"
     :required="$props.required"
-    :editable="$props.editable"
+    :disabled="$props.disabled"
     :readonly="true"
     :rules="$props.rules"
     :messages="messages"
@@ -15,6 +15,7 @@
     :modelValue="toShortDateFormat"
     @click="onClick"
     @update:modelValue="onClear"
+    v-bind="$attrs"
   >
     <template
       #prepend-inner
@@ -25,7 +26,7 @@
         <FSButton
           variant="icon"
           icon="mdi-calendar"
-          :editable="$props.editable"
+          :disabled="$props.disabled"
           :color="ColorEnum.Dark"
         />
       </slot>
@@ -114,10 +115,10 @@ export default defineComponent({
       required: false,
       default: () => []
     },
-    editable: {
+    disabled: {
       type: Boolean,
       required: false,
-      default: true
+      default: false
     }
   },
   emits: ["update:modelValue"],
@@ -139,7 +140,7 @@ export default defineComponent({
     const messages = computed((): string[] => getMessages(props.modelValue, props.rules, true));
 
     const onClick = (): void => {
-      if (props.editable) {
+      if (!props.disabled) {
         dialog.value = true;
       }
     };

package/components/fields/FSDateTimeField.vue

@@ -10,7 +10,7 @@
         :color="$props.color"
         :hideHeader="$props.hideHeader"
         :required="$props.required"
-        :editable="$props.editable"
+        :disabled="$props.disabled"
         :readonly="true"
         :rules="$props.rules"
         :messages="messages"
@@ -29,7 +29,7 @@
             <FSButton
               variant="icon"
               icon="mdi-calendar"
-              :editable="$props.editable"
+              :disabled="$props.disabled"
               :color="ColorEnum.Dark"
               @click="openMobileOverlay"
             />
@@ -91,9 +91,10 @@
     <template
       v-else
     >
-      <v-menu
+      <FSMenu
+        min-width="300px"
         :closeOnContentClick="false"
-        :modelValue="menu && $props.editable"
+        :modelValue="menu && !$props.disabled"
         @update:modelValue="menu = $event"
       >
         <template
@@ -106,7 +107,7 @@
             :color="$props.color"
             :hideHeader="$props.hideHeader"
             :required="$props.required"
-            :editable="$props.editable"
+            :disabled="$props.disabled"
             :readonly="true"
             :rules="$props.rules"
             :messages="messages"
@@ -125,7 +126,7 @@
                 <FSButton
                   variant="icon"
                   icon="mdi-calendar"
-                  :editable="$props.editable"
+                  :disabled="$props.disabled"
                   :color="ColorEnum.Dark"
                 />
               </slot>
@@ -187,7 +188,7 @@
             </FSCol>
           </FSCard>
         </FSWindow>
-      </v-menu>
+      </FSMenu>
     </template>
   </FSCol>
 </template>
@@ -206,6 +207,7 @@ import FSWindow from "../FSWindow.vue";
 import FSButton from "../FSButton.vue";
 import FSClock from "../FSClock.vue";
 import FSCard from "../FSCard.vue";
+import FSMenu from '../FSMenu.vue';
 import FSCol from "../FSCol.vue";
 
 export default defineComponent({
@@ -218,6 +220,7 @@ export default defineComponent({
     FSButton,
     FSClock,
     FSCard,
+    FSMenu,
     FSCol
   },
   props: {
@@ -256,10 +259,10 @@ export default defineComponent({
       required: false,
       default: () => []
     },
-    editable: {
+    disabled: {
       type: Boolean,
       required: false,
-      default: true
+      default: false
     }
   },
   emits: ["update:modelValue"],
@@ -279,7 +282,7 @@ export default defineComponent({
     const messages = computed((): string[] => getMessages(props.modelValue, props.rules));
 
     const openMobileOverlay = () => {
-      if (!props.editable) {
+      if (props.disabled) {
         return;
       }
       dialog.value = true;
@@ -301,7 +304,7 @@ export default defineComponent({
       if (props.modelValue) {
         // FSClock just gives two numbers without consideration for the time zone
         // We must adjust the time to the user's time zone
-        innerTime.value = Math.floor((props.modelValue + getUserOffset()) % (24 * 60 * 60 * 1000));
+        innerTime.value = Math.floor((props.modelValue + getUserOffset(props.modelValue)) % (24 * 60 * 60 * 1000));
         innerDate.value = props.modelValue - innerTime.value;
       }
       else {

package/components/fields/FSDateTimeRangeDialog.vue

@@ -0,0 +1,160 @@
+<template>
+  <FSDialogSubmit
+    :title="$props.label"
+    :submitButtonColor="$props.color"
+    :modelValue="$props.dialog"
+    :disabled="!valid"
+    @update:modelValue="$emit('cancel')"
+    @click:submitButton="onSubmit"
+  >
+    <template
+      #body
+    >
+      <FSCol>
+        <FSCalendarTwin
+          :color="$props.color"
+          v-model="innerDateRange"
+        />
+        <FSRow>
+          <FSCol>
+            <FSClock
+              :color="$props.color"
+              :date="innerDateLeft"
+              v-model="innerTimeLeft"
+            />
+          </FSCol>
+          <FSCol>
+            <FSClock
+              :color="$props.color"
+              :date="innerDateRight"
+              v-model="innerTimeRight"
+            />
+          </FSCol>
+        </FSRow>
+      </FSCol>
+    </template>
+  </FSDialogSubmit>
+</template>
+
+<script lang="ts">
+import { computed, defineComponent, type PropType, ref, watch } from "vue";
+
+import { type ColorBase, ColorEnum } from "@dative-gpi/foundation-shared-components/models";
+import { useAppTimeZone } from "@dative-gpi/foundation-shared-services/composables";
+
+import FSDialogSubmit from "../FSDialogSubmit.vue";
+import FSCalendarTwin from "../FSCalendarTwin.vue";
+import FSClock from "../FSClock.vue";
+import FSCol from "../FSCol.vue";
+import FSRow from "../FSRow.vue";
+
+export default defineComponent({
+  name: "FSDateTimeRangeDialog",
+  components: {
+    FSDialogSubmit,
+    FSCalendarTwin,
+    FSClock,
+    FSCol,
+    FSRow
+  },
+  props: {
+    label: {
+      type: String as PropType<string | null>,
+      required: false,
+      default: null
+    },
+    modelValue: {
+      type: Array as PropType<number[] | null>,
+      required: false,
+      default: () => null
+    },
+    color: {
+      type: String as PropType<ColorBase>,
+      required: false,
+      default: ColorEnum.Primary
+    },
+    dialog: {
+      type: Boolean,
+      required: false,
+      default: false
+    }
+  },
+  emits: ["update:modelValue", "cancel"],
+  setup(props, { emit }) {
+    const { getUserOffset } = useAppTimeZone();
+
+    const innerDateRange = ref<number[] | null>(null);
+    const innerTimeRight = ref(0);
+    const innerTimeLeft = ref(0);
+
+    const innerDateLeft = computed((): number | null => {
+      if (innerDateRange.value && Array.isArray(innerDateRange.value) && innerDateRange.value.length) {
+        return innerDateRange.value[0];
+      }
+      return null;
+    });
+
+    const innerDateRight= computed((): number | null => {
+      if (innerDateRange.value && Array.isArray(innerDateRange.value) && innerDateRange.value.length > 1) {
+        return innerDateRange.value[1];
+      }
+      return null;
+    });
+
+    const valid = computed((): boolean => {
+      return !!innerDateRange.value && Array.isArray(innerDateRange.value) && innerDateRange.value.length > 1 &&
+        innerDateRange.value[0] + innerTimeLeft.value < innerDateRange.value[1] + innerTimeRight.value;
+    });
+
+    const reset = (): void => {
+      if (props.modelValue && Array.isArray(props.modelValue)) {
+        // FSClock just gives two numbers without consideration for the time zone
+        // We must adjust the time to the user's time zone
+        switch (props.modelValue.length) {
+          case 0: {
+            break;
+          }
+          case 1: {
+            innerTimeLeft.value = Math.floor((props.modelValue[0] + getUserOffset(props.modelValue[0])) % (24 * 60 * 60 * 1000));
+            innerDateRange.value = [props.modelValue[0] - innerTimeLeft.value];
+            break;
+          }
+          default: {
+            innerTimeLeft.value = Math.floor((props.modelValue[0] + getUserOffset(props.modelValue[0])) % (24 * 60 * 60 * 1000));
+            innerTimeRight.value = Math.floor((props.modelValue[1] + getUserOffset(props.modelValue[1])) % (24 * 60 * 60 * 1000));
+            innerDateRange.value = [props.modelValue[0] - innerTimeLeft.value, props.modelValue[1] - innerTimeRight.value];
+            break;
+          }
+        }
+      }
+      else {
+        innerDateRange.value = null;
+        innerTimeLeft.value = 0;
+        innerTimeRight.value = 0;
+      }
+    };
+
+    watch(() => props.modelValue, () => {
+      reset();
+    }, { immediate: true });
+
+    const onSubmit = (): void => {
+      if (valid.value) {
+        emit("update:modelValue", [innerDateRange.value![0] + innerTimeLeft.value, innerDateRange.value![1] + innerTimeRight.value]);
+        return;
+      }
+    };
+
+    return {
+      valid,
+      innerDateLeft,
+      innerTimeLeft,
+      innerDateRight,
+      innerTimeRight,
+      innerDateRange,
+      ColorEnum,
+      onSubmit
+    };
+  }
+});
+</script>

package/components/fields/FSDateTimeRangeField.vue

@@ -6,7 +6,7 @@
     :color="$props.color"
     :hideHeader="$props.hideHeader"
     :required="$props.required"
-    :editable="$props.editable"
+    :disabled="$props.disabled"
     :readonly="true"
     :rules="$props.rules"
     :messages="messages"
@@ -15,6 +15,7 @@
     :modelValue="toShortTimeFormat"
     @click="onClick"
     @update:modelValue="onClear"
+    v-bind="$attrs"
   >
     <template
       #prepend-inner
@@ -25,7 +26,7 @@
         <FSButton
           variant="icon"
           icon="mdi-calendar"
-          :editable="$props.editable"
+          :disabled="$props.disabled"
           :color="ColorEnum.Dark"
         />
       </slot>
@@ -40,66 +41,34 @@
       />
     </template>
   </FSTextField>
-  <FSDialogSubmit
+  <FSDateTimeRangeDialog
     :title="$props.label"
     :submitButtonColor="$props.color"
-    @click:submitButton="onSubmit"
-    v-model="dialog"
-  >
-    <template
-      #body
-    >
-      <FSCol>
-        <FSCalendarTwin
-          :color="$props.color"
-          v-model="innerDateRange"
-        />
-        <FSRow>
-          <FSCol>
-            <FSClock
-              :color="$props.color"
-              :date="innerDateLeft"
-              v-model="innerTimeLeft"
-            />
-          </FSCol>
-          <FSCol>
-            <FSClock
-              :color="$props.color"
-              :date="innerDateRight"
-              v-model="innerTimeRight"
-            />
-          </FSCol>
-        </FSRow>
-      </FSCol>
-    </template>
-  </FSDialogSubmit>
+    :dialog="dialog"
+    :modelValue="$props.modelValue"
+    :color="$props.color"
+    @cancel="dialog = false"
+    @update:modelValue="onSubmit($event)"
+  />
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, type PropType, ref, watch } from "vue";
+import { computed, defineComponent, type PropType, ref } from "vue";
 
 import { type ColorBase, ColorEnum } from "@dative-gpi/foundation-shared-components/models";
-import { useAppTimeZone, useDateFormat } from "@dative-gpi/foundation-shared-services/composables";
+import { useDateFormat } from "@dative-gpi/foundation-shared-services/composables";
 import { useRules } from "@dative-gpi/foundation-shared-components/composables";
 
-import FSDialogSubmit from "../FSDialogSubmit.vue";
-import FSCalendarTwin from "../FSCalendarTwin.vue";
+import FSDateTimeRangeDialog from "./FSDateTimeRangeDialog.vue";
 import FSTextField from "./FSTextField.vue";
 import FSButton from "../FSButton.vue";
-import FSClock from "../FSClock.vue";
-import FSCol from "../FSCol.vue";
-import FSRow from "../FSRow.vue";
 
 export default defineComponent({
   name: "FSDateTimeRangeField",
   components: {
-    FSDialogSubmit,
-    FSCalendarTwin,
+    FSDateTimeRangeDialog,
     FSTextField,
-    FSButton,
-    FSClock,
-    FSCol,
-    FSRow
+    FSButton
   },
   props: {
     label: {
@@ -137,24 +106,19 @@ export default defineComponent({
       required: false,
       default: () => []
     },
-    editable: {
+    disabled: {
       type: Boolean,
       required: false,
-      default: true
+      default: false
     }
   },
   emits: ["update:modelValue"],
   setup(props, { emit }) {
-    const { getUserOffset } = useAppTimeZone();
     const { epochToShortTimeFormat } = useDateFormat();
     const { validateOn, getMessages } = useRules();
 
     const dialog = ref(false);
 
-    const innerDateRange = ref<number[] | null>(null);
-    const innerTimeRight = ref(0);
-    const innerTimeLeft = ref(0);
-
     const toShortTimeFormat = computed((): string => {
       if (!props.modelValue || !Array.isArray(props.modelValue) || !props.modelValue.length) {
         return "";
@@ -162,88 +126,32 @@ export default defineComponent({
       return props.modelValue.map((epoch) => epochToShortTimeFormat(epoch)).join(" - ");
     });
 
-    const innerDateLeft = computed((): number | null => {
-      if (innerDateRange.value && Array.isArray(innerDateRange.value) && innerDateRange.value.length) {
-        return innerDateRange.value[0];
-      }
-      return null;
-    });
-
-    const innerDateRight= computed((): number | null => {
-      if (innerDateRange.value && Array.isArray(innerDateRange.value) && innerDateRange.value.length > 1) {
-        return innerDateRange.value[1];
-      }
-      return null;
-    });
-
     const messages = computed((): string[] => getMessages(props.modelValue, props.rules, true));
 
     const onClick = (): void => {
-      if (props.editable) {
+      if (!props.disabled) {
         dialog.value = true;
       }
     };
 
-    const onClear = (): void => {
-      emit("update:modelValue", null);
-      innerTimeLeft.value = 0;
-      innerTimeRight.value = 0;
-      innerDateRange.value = null;
-    };
-
-    const onSubmit = (): void => {
-      if (innerDateRange.value && Array.isArray(innerDateRange.value) && innerDateRange.value.length > 1) {
-        emit("update:modelValue", [innerDateRange.value[0] + innerTimeLeft.value, innerDateRange.value[1] + innerTimeRight.value]);
-      }
+    const onSubmit = (value: number[]): void => {
+      emit("update:modelValue", value);
       dialog.value = false;
     };
 
-    const reset = (): void => {
-      if (props.modelValue && Array.isArray(props.modelValue)) {
-        // FSClock just gives two numbers without consideration for the time zone
-        // We must adjust the time to the user's time zone
-        switch (props.modelValue.length) {
-          case 0: {
-            break;
-          }
-          case 1: {
-            innerTimeLeft.value = Math.floor((props.modelValue[0] + getUserOffset()) % (24 * 60 * 60 * 1000));
-            innerDateRange.value = [props.modelValue[0] - innerTimeLeft.value];
-            break;
-          }
-          default: {
-            innerTimeLeft.value = Math.floor((props.modelValue[0] + getUserOffset()) % (24 * 60 * 60 * 1000));
-            innerTimeRight.value = Math.floor((props.modelValue[1] + getUserOffset()) % (24 * 60 * 60 * 1000));
-            innerDateRange.value = [props.modelValue[0] - innerTimeLeft.value, props.modelValue[1] - innerTimeRight.value];
-            break;
-          }
-        }
-      }
-      else {
-        innerDateRange.value = null;
-        innerTimeLeft.value = 0;
-        innerTimeRight.value = 0;
-      }
+    const onClear = (): void => {
+      emit("update:modelValue", null);
     };
 
-    watch(() => props.modelValue, () => {
-      reset();
-    }, { immediate: true });
-
     return {
       toShortTimeFormat,
-      innerDateLeft,
-      innerTimeLeft,
-      innerDateRight,
-      innerTimeRight,
-      innerDateRange,
       validateOn,
       ColorEnum,
       messages,
       dialog,
       onSubmit,
       onClear,
-      onClick
+      onClick,
     };
   }
 });