@fto-consult/expo-ui 2.2.3 → 2.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -62,7 +62,7 @@
     "@expo/html-elements": "^0.2.0",
     "@expo/metro-config": "^0.4.0",
     "@expo/webpack-config": "^0.17.2",
-    "@fto-consult/common": "^1.11.3",
+    "@fto-consult/common": "^1.11.5",
     "@gorhom/portal": "^1.0.14",
     "@react-native-async-storage/async-storage": "~1.17.3",
     "@react-native-community/datetimepicker": "6.5.2",

package/src/components/Date/DateTime.js

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-import Date from "./DatePickerInput";
+import DateComponent from "./DatePickerInput";
 import Time,{parseTime} from "./Time";
 import React from "$react";
 import PropTypes from "prop-types";
@@ -57,7 +57,7 @@ export default function DateTimePickerComponent({left,withSeconds,right,format,d
             onChange(args);
         }
     }
-    return <Date
+    return <DateComponent
         defaultValue = {dateObj}
         disabled = {disabled}
         readOnly = {readOnly}
@@ -107,7 +107,7 @@ export default function DateTimePickerComponent({left,withSeconds,right,format,d
 }
 
 DateTimePickerComponent.propTypes = {
-    ...Date.propTypes,
+    ...DateComponent.propTypes,
     dateProps : PropTypes.object,
     timeProps : PropTypes.object,
     dateFormat : PropTypes.string, //Le format de date

package/src/components/Filter/index.js

@@ -16,6 +16,7 @@ import theme from "$theme";
 import {isMobileMedia} from "$cplatform/dimensions";
 import { ActivityIndicator } from "react-native-paper";
 import { getSessionData,setSessionData } from "./session";
+import DialogProvider from "$components/Form/FormData/DialogProvider";
 
 const manualRunKey = "manual-run";
 
@@ -169,7 +170,7 @@ export default class Filter extends AppComponent {
   fireValueChanged (forceRun){
       if(this.willRunManually() && !forceRun) return;
       let {defaultValue:value,prevDefaultValue,action,ignoreCase,operator} = this.state;
-      const force = forceRun ===true ? true : false;
+      let force = forceRun ===true ? true : false;
       if(!isObjOrArray(value) && (isNullOrEmpty(value,true) || value ==='undefined') ){
           value = undefined;
       }
@@ -250,57 +251,68 @@ export default class Filter extends AppComponent {
      if(DateLib.isValidSQLDate(split[1])){
         end = split[1];
      }
-    let fContext = undefined;
-    mountDialog(<FormDialog
-        visible
-        key = {_uniqid("period-filter-date")}
-        fields = {{
-           start : {type:'date',text:'Du',defaultValue:start},
-           end : {type:'date',text:'Au',defaultValue:end}
-        }}
-        title = {"Définir une période ["+defaultStr(this.props.label,this.props.text)+"]"}
-        no = {{
-           text : 'Annuler',
-           icon : 'cancel'
-        }}
-        yes = {{
-           text : 'Définir',
-           icon : "check"
-        }}
-        onSuccess = {({data})=>{
+    const type = this.type.contains("date")? this.type : "date";
+    DialogProvider.open({
+        fields : {
+           start : {type,text:'Du',defaultValue:start},
+           end : {type,text:'Au',defaultValue:end}
+        },
+        title :"Définir une période ["+defaultStr(this.props.label,this.props.text)+"]",
+        actions : {
+          no : {
+            text : 'Annuler',
+            icon : 'cancel',
+            isFormAction : false,
+            onPress : ()=>{
+              DialogProvider.close();
+            }
+         },
+         yes : {
+              text : 'Définir',
+              icon : "check"
+          },
+        },
+        onSuccess : ({data})=>{
+            console.log(data," is dataa")
            if(isFunction(success)){
               success(data.start+"=>"+data.end);
            }
+           DialogProvider.close();
            return true;
-        }}
-    />)
+        }})
   }
   setAction(action,text){
     if(!(this.searchFilter.current)) return;
     if(action === this.state.action && action !="$period" && action !== "$today") return;
     let value = this.state.defaultValue;
     let act = defaultStr(action).toLowerCase();
+    const isDateTime = this.type?.contains("time");
+    const dateFormat = isDateTime?DateLib.SQLDateTimeFormat:DateLib.SQLDateFormat;
     if(action == '$period'){
       this.showPeriodSelector((d)=>{
           this.runAction({value:d,action});
       })
     } else if(action =="$today"){
-        return this.runAction({value:new Date().toSQL(),action})
+        return this.runAction({value:new Date().toDateFormat(dateFormat),action})
     } else if(act.startsWith("$") && (act.contains("week") || act.contains("month"))){
       let diff = undefined;
+      const currentDate = new Date();
+      currentDate.setHours(0);
+      currentDate.setMinutes(0);
+      currentDate.setSeconds(0);
       switch (action){
         case "$month":
-            diff = DateLib.currentMonthDaysLimits();
+            diff = DateLib.currentMonthDaysLimits(currentDate);
           break;
         case "$week":      
-            diff = DateLib.currentWeekDaysLimits()
+            diff = DateLib.currentWeekDaysLimits(currentDate)
           break;
         case "$prevWeek":      
-          diff = DateLib.previousWeekDaysLimits()
+          diff = DateLib.previousWeekDaysLimits(currentDate)
         break;
       }
       if(diff){
-        let value = diff.first.toFormat(DateLib.SQLDateFormat) +"=>"+diff.last.toFormat(DateLib.SQLDateFormat);
+        let value = diff.first.toFormat(dateFormat) +"=>"+diff.last.toFormat(dateFormat);
         this.runAction({value,action})
       }
     } else {