@dative-gpi/foundation-shared-components 1.0.135 → 1.0.136-maps

package/components/deviceOrganisations/FSStatusRichCard.vue

@@ -0,0 +1,170 @@
+<template>
+  <component
+    v-if="$props.modelStatus"
+    class="fs-status-rich-card"
+    variant="standard"
+    :is="$attrs.onClick ? FSClickable : FSCard"
+    :padding="$props.padding"
+    :height="$props.height"
+    :width="$props.width"
+    :color="color"
+    :style="style"
+  >
+    <FSCol
+      align="center-center"
+      :gap="$props.gap"
+    >
+      <FSRow
+        align="top-center"
+      >
+        <FSIcon
+          v-if="icon"
+        >
+          {{ icon }}
+        </FSIcon>
+        <FSText
+          v-if="value"
+          font="text-button"
+        >
+          {{ value }}
+        </FSText>
+      </FSRow>
+      <FSText
+        font="text-overline"
+        align="center"
+        :lineClamp="$props.titleClamp"
+      >
+        {{ title }}
+      </FSText>
+      <slot
+        name="footer"
+        v-bind="{ color }"
+      />
+    </FSCol>
+    <div
+      class="fs-status-rich-card-corner"
+    >
+      <slot
+        name="corner"
+        v-bind="{ color }"
+      />
+    </div>
+  </component>
+</template>
+
+<script lang="ts">
+import { computed, defineComponent, type PropType, type StyleValue } from "vue";
+
+import { ColorEnum, type FSDeviceStatusGroup, type FSModelStatus } from "@dative-gpi/foundation-shared-components/models";
+import { useColors } from "@dative-gpi/foundation-shared-components/composables";
+
+import FSClickable from "../FSClickable.vue";
+import FSCard from "../FSCard.vue";
+import FSIcon from "../FSChip.vue";
+import FSText from "../FSText.vue";
+import FSCol from "../FSCol.vue";
+
+export default defineComponent({
+  name: "FSStatusRichCard",
+  components: {
+    FSClickable,
+    FSCard,
+    FSIcon,
+    FSText,
+    FSCol
+  },
+  props: {
+    height: {
+      type: [Array, String, Number] as PropType<string[] | number[] | string | number | null>,
+      required: false,
+      default: "100px"
+    },
+    width: {
+      type: [Array, String, Number] as PropType<string[] | number[] | string | number | null>,
+      required: false,
+      default: "160px"
+    },
+    padding: {
+      type: [Array, String, Number] as PropType<string[] | number[] | string | number | null>,
+      required: false,
+      default: "12px"
+    },
+    gap: {
+      type: [Array, String, Number] as PropType<string[] | number[] | string | number | null>,
+      required: false,
+      default: "8px"
+    },
+    title: {
+      type: [String, null] as PropType<string | null>,
+      required: false,
+      default: null
+    },
+    titleClamp: {
+      type: Number,
+      required: false,
+      default: 2
+    },
+    color: {
+      type: [String, null] as PropType<string | null>,
+      required: false,
+      default: null
+    },
+    fillBackground: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    modelStatus: {
+      type: Object as PropType<FSModelStatus | undefined>,
+      required: true
+    },
+    statusGroup: {
+      type: Object as PropType<FSDeviceStatusGroup | undefined>,
+      required: true
+    }
+  },
+  setup(props) {
+    const { getColors } = useColors();
+
+    const color = computed((): string => {
+      return props.color ?? props.statusGroup?.color ?? props.modelStatus?.colorDefault ?? ColorEnum.Primary;
+    });
+
+    const icon = computed((): string | null => {
+      return props.statusGroup?.icon ?? props.modelStatus?.iconDefault ?? null;
+    });
+
+    const title = computed((): string => {
+      return props.title ?? props.modelStatus?.label;
+    });
+
+    const value = computed((): string | null => {
+      if (props.statusGroup?.label) {
+        return props.statusGroup.label;
+      }
+      if (props.statusGroup?.value && !isNaN(parseFloat(props.statusGroup?.value))) {
+        return `${parseFloat(props.statusGroup.value).toLocaleString("fullwide", { maximumFractionDigits: 2 })} ${props.statusGroup.unit}`;
+      }
+      if (props.statusGroup?.value) {
+        return `${props.statusGroup?.value} ${props.statusGroup?.unit}`;
+      }
+      return null;
+    });
+
+    const style = computed((): StyleValue => ({
+      "--fs-status-rich-card-background-color": props.fillBackground ? getColors(color.value).light : "transparent",
+      "--fs-status-rich-card-border-color": props.fillBackground ? getColors(color.value).base : getColors(ColorEnum.Light).dark
+    }));
+
+    return {
+      FSClickable,
+      FSCard,
+      color,
+      style,
+      title,
+      value,
+      icon
+    };
+  }
+});
+</script>

package/components/map/FSMap.vue

@@ -22,7 +22,6 @@
           :color="ColorEnum.Primary"
           :latlng="gpsPosition"
         />
-  
         <FSMapFeatureGroup
           v-if="$props.areas"
           :expected-layers="$props.areas.length"
@@ -36,7 +35,6 @@
             @click="$emit('update:selectedAreaId', area.id)"
           />
         </FSMapFeatureGroup>
-  
         <FSMapMarkerClusterGroup
           v-if="$props.locations"
           :expected-layers="$props.locations.length"
@@ -54,6 +52,7 @@
             @click="$emit('update:selectedLocationId', location.id)"
           />
         </FSMapMarkerClusterGroup>
+        <slot />
       </template>
     </div>
 

package/components/map/FSMapMarker.vue

@@ -87,15 +87,15 @@ export default {
         icon = divIcon({
           html: locationMarkerHtml(props.icon, getColors(props.color).base, props.label),
           iconSize: [size, size],
-          className: props.selected ? 'fs-map-location fs-map-location-selected' : 'fs-map-location',
+          className: props.selected ? 'fs-map-marker fs-map-location fs-map-location-selected' : 'fs-map-marker fs-map-location',
           iconAnchor: [size / 2, size / 2],
         });
       } else {
-        const size = 20;
+        const size = 16;
         icon = divIcon({
-          html: pinMarkerHtml(getColors(props.color).base),
+          html: pinMarkerHtml(getColors(props.color).base, props.label),
           iconSize: [size, size],
-          className: props.selected ? 'fs-map-location fs-map-location-selected' : 'fs-map-location',
+          className: props.selected ? 'fs-map-marker fs-map-pin fs-map-pin-selected' : 'fs-map-marker fs-map-pin',
           iconAnchor: [size / 2, size / 2],
         });
       }

package/components/map/FSMapMarkerClusterGroup.vue

@@ -45,7 +45,7 @@ export default {
 
         return divIcon({
           html: clusterMarkerHtml(cluster.getChildCount()),
-          className: 'fs-map-location fs-map-location-full',
+          className: 'fs-map-marker fs-map-cluster-marker',
           iconSize: [size, size],
           iconAnchor: [size / 2, size / 2],
         });

package/components/tiles/FSGroupTileUI.vue

@@ -97,6 +97,13 @@
           :imageId="$props.imageId"
           :width="imageSize"
         />
+        <FSIconCard
+          v-else-if="$props.icon"
+          backgroundVariant="standard"
+          :backgroundColor="ColorEnum.Background"
+          :icon="$props.icon"
+          :size="imageSize"
+        />
       </FSRow>
     </FSCol>
   </FSTile>
@@ -108,6 +115,7 @@ import { computed, defineComponent, type PropType } from "vue";
 import { useBreakpoints } from "@dative-gpi/foundation-shared-components/composables";
 import { ColorEnum } from "@dative-gpi/foundation-shared-components/models";
 
+import FSIconCard from "../FSIconCard.vue";
 import FSImage from "../FSImage.vue";
 import FSColor from "../FSColor.vue";
 import FSSpan from "../FSSpan.vue";
@@ -118,6 +126,7 @@ import FSRow from "../FSRow.vue";
 export default defineComponent({
   name: "FSGroupTileUI",
   components: {
+    FSIconCard,
     FSImage,
     FSColor,
     FSSpan,
@@ -131,6 +140,10 @@ export default defineComponent({
       required: false,
       default: null
     },
+    icon: {
+      type: String,
+      required: false
+    },
     label: {
       type: String as PropType<string | null>,
       required: false,
@@ -183,7 +196,7 @@ export default defineComponent({
     });
 
     const infoWidth = computed((): string => {
-      if (!props.imageId) {
+      if (!props.imageId && !props.icon) {
         return "100%";
       }
       return `calc(100% - ${imageSize.value}px - 24px)`;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-shared-components",
   "sideEffects": false,
-  "version": "1.0.135",
+  "version": "1.0.136-maps",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,8 +10,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-shared-domain": "1.0.135",
-    "@dative-gpi/foundation-shared-services": "1.0.135"
+    "@dative-gpi/foundation-shared-domain": "1.0.136-maps",
+    "@dative-gpi/foundation-shared-services": "1.0.136-maps"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^1.0.0",
@@ -35,5 +35,5 @@
     "sass": "1.71.1",
     "sass-loader": "13.3.2"
   },
-  "gitHead": "a8b8d2c285134ca72edf1bb0d3e224815f04c131"
+  "gitHead": "e5804d19ea9d2d1f215ddab730d72f0256841295"
 }

package/styles/components/fs_map.scss

@@ -77,17 +77,10 @@
     }
   }
 
-  .fs-map-point-pin {
-    background-color: var(--fs-map-point-pin-color);
-    border-radius: 100%;
-  }
-
-  .fs-map-location > div {
+  .fs-map-marker > div {
     display: flex;
     height: 100%;
-    color: var(--fs-map-location-pin-color);
     border-radius: 50%;
-    background-color: white;
     filter: drop-shadow(0px 2px 4px rgba(0, 0, 0, 0.4));
     align-items: center;
     justify-content: center;
@@ -103,7 +96,7 @@
     }
   }
 
-  .fs-map-location-full > div {
+  .fs-map-cluster-marker > div {
     background-color: var(--fs-map-location-pin-color);
     color: white;
   }
@@ -126,6 +119,41 @@
     }
   }
 
+  .fs-map-location > div {
+    color: var(--fs-map-location-pin-color);
+    background-color: white;
+  }
+
+  .fs-map-pin > div {
+    background-color: var(--fs-map-point-pin-color);
+    position: relative;
+
+    transition: transform 0.28s cubic-bezier(0.4, 0, 0.2, 1);
+  }
+
+  .fs-map-pin > div::before {
+    content: "";
+    position: absolute;
+    top: -4px;
+    left: -4px;
+    width: calc(100% + 8px);
+    height: calc(100% + 8px);
+    border-radius: 50%;
+    border: 2px solid var(--fs-map-point-pin-color);
+    opacity: 0.4;
+
+    @include clickscreen {
+      &:hover {
+        opacity: 1;
+      }
+    }
+  }
+
+  .fs-map-pin-selected > div {
+    transform: scale(1.35);
+  }
+
+
   .fs-map-site {
     opacity: 0.6;
     transition: opacity 0.28s cubic-bezier(0.4, 0, 0.2, 1);

package/styles/components/fs_status_rich_card.scss

@@ -0,0 +1,13 @@
+.fs-status-rich-card {
+  position: relative;
+  flex-grow: 1;
+  background-color: var(--fs-status-rich-card-background-color);
+  border-color: var(--fs-status-rich-card-border-color);
+}
+
+.fs-status-rich-card-corner {
+  position: absolute;
+  display: flex;
+  right: 2px;
+  top: 2px;
+}

package/styles/components/index.scss

@@ -55,6 +55,7 @@
 @import "fs_slide_group.scss";
 @import "fs_slider.scss";
 @import "fs_span.scss";
+@import "fs_status_rich_card.scss";
 @import "fs_switch.scss";
 @import "fs_tag.scss";
 @import "fs_tabs.scss";