@fto-consult/expo-ui 2.3.0 → 2.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "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.13",
+    "@fto-consult/common": "^1.11.15",
     "@gorhom/portal": "^1.0.14",
     "@react-native-async-storage/async-storage": "~1.17.3",
     "@react-native-community/datetimepicker": "6.5.2",

package/src/components/Datagrid/Accordion/Filters.js

@@ -10,6 +10,7 @@ import Label from "$ecomponents/Label";
 import theme from "$theme"
 import Expandable from "$ecomponents/Expandable";
 import { Dimensions } from "react-native";
+import Grid from "$components/Grid";
 
 const MIN_WIDTH = 250;
 let windowWidth = Dimensions.get("window").width;
@@ -28,6 +29,12 @@ const FiltersAccordionComponent = React.forwardRef((props,ref)=>{
     const filterTitle = defaultStr(customFilterTitle,'Filtres');
     const canHandlerFilterRef = React.useRef(0);
     const filteredRef = React.useRef({});
+    const cellProps = {
+        desktopSize : 4,
+        tabletSize :6,
+        phoneSize : 12, 
+        style : [theme.styles.ph1],
+    }
     const prepareContent = (filters)=>{
         const content = []
         const colMenus = [];
@@ -37,7 +44,7 @@ const FiltersAccordionComponent = React.forwardRef((props,ref)=>{
         };
         Object.map(filters,(filter,index)=>{
             if(React.isValidElement(filter)){
-                content.push(<React.Fragment key={index}>{filter}</React.Fragment>)
+                content.push(<Grid.Cell {...cellProps} key={index}>{filter}</Grid.Cell>)
             } else if(isObj(filter)){ 
                 const {onChange} = filter;
                 const key = defaultStr(filter.key,filter.field,filter.index,index+"");
@@ -65,7 +72,9 @@ const FiltersAccordionComponent = React.forwardRef((props,ref)=>{
                     }
                 }
                 mainFilterTitle +=(content.length?",":"")+"\n"+defaultStr(filter.label,filter.text,filter.field)+" : "+defVal+""
-                content.push(<Filter
+                content.push(
+                    <Grid.Cell {...cellProps} key={key}>
+                    <Filter
                         {...filter}
                         dynamicRendered
                         isLoading = {isLoading && filteredRef.current[key] ? true : false}
@@ -88,7 +97,7 @@ const FiltersAccordionComponent = React.forwardRef((props,ref)=>{
                         withBottomSheet
                         containerProps = {{...containerProps}}
                         inputProps = {{containerProps}}
-                    />)
+                    /></Grid.Cell>)
             }
         })
         return {content,mainFilterTitle,colMenus}
@@ -130,10 +139,10 @@ const FiltersAccordionComponent = React.forwardRef((props,ref)=>{
                     </View>
                 </Expandable>
             </View>
-            {content.length ? <View style={styles.contentContainer}>
-                <View style = {[styles.content]}>
+            {content.length ? <View style={[theme.styles.w100]}>
+                <Grid style={theme.styles.w100}>
                     {content}
-                </View>
+                </Grid>
             </View> : null}
         </View>
     </Content>

package/src/components/Datagrid/Common/Common.js

@@ -481,7 +481,7 @@ export default class CommonDatagridComponent extends AppComponent {
             header.colIndex = colIndex;
             this.state.columns[header.field] = header;
             /*** les pieds de pages sont les données de type decimal, où qu'on peut compter */
-            if(header.footer !== false && (arrayValueExists(['decimal','number','money'],header.type) || header.format == 'money')){
+            if(header.footer !== false && ((arrayValueExists(['decimal','number','money'],header.type) && header.format) || header.format == 'money' || header.format =='number')){
                 footers[header.field] = header;
             }
             if(!this.hasColumnsHalreadyInitialized){

package/src/components/Date/DatePickerInput/index.js

@@ -11,7 +11,6 @@ import TextField from "$ecomponents/TextField";
 import Icon from "$ecomponents/Icon";
 import {StyleSheet,View} from "react-native";
 import DatePickerModal from '../DatePickerModal'
-import "../i18n";
 import PeriodActionComponent from "../PeriodAction";
 
 const validMinDate = (date,minDate)=>{

package/src/components/Date/dictionary.js

@@ -9,6 +9,12 @@ const Dictionary = {
         mustBeLowerThan: 'doit être plus récente de',
         mustBeBetween: 'doit être entre',
         dateIsDisabled: 'la date n\'est pas autorisée',
+        previous: 'Précédent',
+        next: 'Suivant',
+        typeInDate: 'Entrer la date',
+        pickDateFromCalendar: 'Sélectionner une date dans le calendrier',
+        close: 'Fermer',
+        "DD/MM/YYYY" : "JJ/MM/AAAA",
     },
     en : {
         save: 'Save',
@@ -20,6 +26,12 @@ const Dictionary = {
         mustBeLowerThan: 'Must be earlier then',
         mustBeBetween: 'Must be between',
         dateIsDisabled: 'Day is not allowed',
+        previous: 'Previous',
+        next: 'Next',
+        typeInDate: 'Type in date',
+        pickDateFromCalendar: 'Pick date from calendar',
+        close: 'Close',
+        "DD/MM/YYYY" : "DD/MM/AAAA"
     }
 }
 

package/src/components/Date/utils.common.js

@@ -1,3 +1,4 @@
 import {registerTranslation} from 'react-native-paper-dates'
 import Dictionary from "./dictionary";
-registerTranslation("fr",Dictionary.fr);
+registerTranslation("fr",Dictionary.fr);
+registerTranslation("en",Dictionary.en);

package/src/components/Filter/index.js

@@ -42,6 +42,7 @@ const _operators = {
 }
 
 const periodActions = {
+  $yesterday : "Hier",
   $today:"Aujourd'hui",
   $prevWeek:"Semaine passée",
   $week:'Cette semaine',
@@ -185,7 +186,7 @@ export default class Filter extends AppComponent {
       let originValue = value;
       const type = defaultStr(this.props.type).toLowerCase().trim();
       value = parseDecimal(value,type);
-      if(action =="$today"){
+      if(action =="$today" || action =='$yesterday'){
          force = true;
       }
       let prev = JSON.stringify(defaultObj(this.previousObj)),//{value:this.previousValue,operator:this.previousOperator,action:this.previousAction}
@@ -206,7 +207,7 @@ export default class Filter extends AppComponent {
           let originAction = action;
           if(isNonNullString(action)){
             action = action.toLowerCase().trim();
-            if(action =="$today"){
+            if(action =="$today" || action =='$yesterday'){
               action = "$eq";
             } else if(action.startsWith("$") && (action.contains("week") || action.contains("month"))){
               action = "$period";
@@ -294,7 +295,7 @@ export default class Filter extends AppComponent {
   }
   setAction(action,text){
     if(!(this.searchFilter.current)) return;
-    if(action === this.state.action && action !="$period" && action !== "$today") return;
+    if(action === this.state.action && action !="$period" && action !== "$today" && action !='$yesterday') return;
     let value = this.state.defaultValue;
     let act = defaultStr(action).toLowerCase();
     const isDateTime = this.type?.contains("time");
@@ -305,7 +306,9 @@ export default class Filter extends AppComponent {
       })
     } else if(action =="$today"){
         return this.runAction({value:new Date().resetHours().resetMinutes().resetSeconds().toFormat(dateFormat),action})
-    } else if(act.startsWith("$") && (act.contains("week") || act.contains("month"))){
+    } else if(action =="$yesterday"){
+      return this.runAction({value: DateLib.removeDays(1,new Date(),null,true).resetHours().resetMinutes().resetSeconds().toFormat(dateFormat),action})
+  } else if(act.startsWith("$") && (act.contains("week") || act.contains("month"))){
       let diff = undefined;
       const currentDate = new Date();
       currentDate.setHours(0);
@@ -507,7 +510,7 @@ export default class Filter extends AppComponent {
                        if(checked && (isNumber(defaultValue) || isNonNullString(defaultValue))) {
                          let hasS = false;
                          let act = defaultStr(action).toLowerCase();
-                         if(act =="$today"){
+                         if(act =="$today" || act =='$yesterday'){
                             
                          } else if((action =="$period" || (act.startsWith("$") && (act.contains("week") || act.contains("month"))))){
                            let sp = defaultValue.split("=>");

package/src/components/Date/i18n.js

@@ -1,11 +0,0 @@
-// Copyright 2022 @fto-consult/Boris Fouomene. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-import i18n from "$i18n";
-
-i18n.dictionary({
-    fr : {
-        "DD/MM/YYYY" : "JJ/MM/AAAA"
-    }
-})