Merge branch 'develop' into release/2.6

components/Ui/Input/DateTimePicker.vue

@@ -2,7 +2,7 @@
   <v-row>
     <v-col cols="12" md="6">
       <v-text-field
-        :model-value="dateModel ? date.format(dateModel, 'fullDateWithWeekday') : undefined"
+        :model-value="dateModel ? _useDate.format(dateModel, 'fullDateWithWeekday') : undefined"
         :label="$t('choose_day')"
         prepend-icon="fas fa-calendar"
         :rules="rules"
@@ -146,24 +146,23 @@ const props = defineProps({
 
 const showMenuTime = ref(false)
 const showMenuDate = ref(false)
-const date = useDate()
+const _useDate = useDate()
 const { fieldViolations, updateViolationState } = useFieldViolation(props.field)
 
 const dateModel = computed(()=> props.modelValue ? new Date(props.modelValue) : undefined)
-const time = computed(()=>   props.modelValue ? date.format(new Date(props.modelValue),'fullTime24h') : undefined)
-
+const time = computed(()=>   props.modelValue ? _useDate.format(new Date(props.modelValue),'fullTime24h') : undefined)
 const emit = defineEmits(['update:model-value'])
 
 const onUpdateDate = (event: string) => {
   updateViolationState()
   let date = DateUtils.combineDateAndTime(event, time.value)
-  emit('update:model-value', date.toISOString())
+  emit('update:model-value', date.toISOString().replace('.000Z', '+00:00'))
 }
 
 const onUpdateTime = (event: string) => {
   updateViolationState()
   let date = DateUtils.combineDateAndTime(dateModel.value, event)
-  emit('update:model-value', date.toISOString())
+  emit('update:model-value', date.toISOString().replace('.000Z', '+00:00'))
 }
 
 onBeforeUnmount(() => {