@fto-consult/expo-ui 2.20.0 → 2.21.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "2.20.0",
+  "version": "2.21.0",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -61,7 +61,7 @@
     "@emotion/native": "^11.10.0",
     "@expo/html-elements": "^0.2.0",
     "@expo/vector-icons": "^13.0.0",
-    "@fto-consult/common": "^1.23.2",
+    "@fto-consult/common": "^1.23.9",
     "@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/Common/Common.js

@@ -38,6 +38,40 @@ import View from "$ecomponents/View";
 import {Menu} from "$ecomponents/BottomSheet";
 import {styles as tableStyles} from "$ecomponents/Table";
 import {DialogProvider} from "$ecomponents/Form/FormData";
+import Chart from "$ecomponents/Chart";
+
+export const displayTypes = {
+    table : {
+        code : "table",
+        label : 'Tableau',
+        icon : "table",
+        type : 'table',
+    },
+    /*lineChart : {
+        code : 'lineChart',
+        label : 'Graphique|Linéaire',
+        icon : "chart-areaspline",
+        type : 'line',
+    },
+    areaChart : {
+        code : 'areaChart',
+        label : 'Graphique|Surface',
+        icon : "chart-areaspline-variant",
+        type: 'area',
+    },
+    barChart : {
+        code : 'barChart',
+        label : 'Graphique|Barres',
+        icon : "chart-bar",
+        type: 'bar'
+    },
+    donutChar : {
+        code : 'donutChart',
+        label : 'Graphique|Circulaire',
+        icon : "chart-donut",
+        type: 'donut'
+    },*/
+}
 
 export const arrayValueSeparator = ", ";
 
@@ -85,6 +119,17 @@ export default class CommonDatagridComponent extends AppComponent {
             showFooters : defaultBool(props.showFooters,(sData.showFooters? true : false)),
             fixedTable : sData.fixedTable
         });
+        const disTypes = {};
+        let hasFoundDisplayTypes = false;
+        Object.map(this.props.displayTypes,(dType,v)=>{
+            if(isNonNullString(dType)){
+                dType = dType.toLowerCase().trim();
+                if(displayTypes[dType]){
+                    disTypes[dType] = Object.clone(displayTypes[dType]);
+                }
+                hasFoundDisplayTypes = true;
+            }
+        });
         Object.defineProperties(this,{
             layoutRef : {
                 value : React.createRef(null),
@@ -118,6 +163,9 @@ export default class CommonDatagridComponent extends AppComponent {
             sectionListHeaderFooters : {value : {}},
             sectionListDataSize : {value : {current : 0}},
             enablePointerEventsRef : {value : {current:false}},
+            configureSectionListSelectedValues : {value : {}},
+            ///les types d'affichage
+            displayTypes : {value : hasFoundDisplayTypes ? disTypes : Object.clone(displayTypes)},
             sectionListColumnsSize : {value : {current:0}}, //la taille du nombre d'éléments de section dans les colonnes
         }) 
         this.isLoading = this.isLoading.bind(this);
@@ -149,10 +197,11 @@ export default class CommonDatagridComponent extends AppComponent {
         this.state.filteredColumns = defaultObj(this.getSessionData("filteredColumns"+this.getSessionNameKey()),this.props.filters);
         this.filtersSelectors = {selector:this.getFilters()};
         const {sectionListColumns} = this.prepareColumns();
-        this.state.sectionListColumns = sectionListColumns;
         if(this.canHandleColumnResize()){
             this.state.columnsWidths = this.preparedColumns.widths;
         }
+        const dType = defaultStr(this.props.displayType,this.getSessionData("diplayType"),"table");
+        this.state.displayType = this.displayTypes[dType] ? this.displayTypes[dType].code : "table" in this.displayTypes ? "table" : Object.keys(this.displayTypes)[0];
         extendObj(this.state,this.prepareData({data}));
         const {width:windowWidth,height:windowHeight} = Dimensions.get("window");
         this.state.layout = {
@@ -197,7 +246,10 @@ export default class CommonDatagridComponent extends AppComponent {
         } else {
             this.currentDataSources = Object.toArray(this.currentDataSources);
         }
+        this.state.sectionListColumns = sectionListColumns;
+        this.state.displayOnlySectionListHeaders = defaultBool(this.getSessionData("displayOnlySectionListHeaders"),this.props.displayOnlySectionListHeaders,false)
     }
+
     /*** si une ligne peut être selectionable */
     canSelectRow(row){
         return isObj(row) && row.isSectionListHeader !== true ? true : false;
@@ -205,7 +257,7 @@ export default class CommonDatagridComponent extends AppComponent {
     prepareSectionListColumns(props){
         props = defaultObj(props,this.props);
         const l = {};
-        (Array.isArray(props.sectionListColumns) ? props.sectionListColumns : []).map((col)=>{
+        (Array.isArray(props.sectionListColumns) ? props.sectionListColumns : defaultArray(this.getSessionData("sectionListColumns"))).map((col)=>{
             if(isNonNullString(col)){
                 l[col.trim()] = {};
             }
@@ -1004,12 +1056,13 @@ export default class CommonDatagridComponent extends AppComponent {
         if(type.contains("date") || type =='time'){
             return new Promise((resolve,reject)=>{
                 DialogProvider.open({
+                    title : 'Format de date',
                     fields : {
                         dateFormat : {
                             type : 'select_dateformat',
                             required : true,
                             text : 'Sélectionnez un format de date',
-                            defaultValue : "dd/mm/yyyy",
+                            defaultValue : defaultStr(this.configureSectionListSelectedValues[column.field],"dd/mm/yyyy"),
                         }
                     },
                     onCancelButtonPress : ()=>{
@@ -1021,6 +1074,7 @@ export default class CommonDatagridComponent extends AppComponent {
                         icon : "check",
                         onPress : ({data})=>{
                             column.format = data.dateFormat;
+                            this.configureSectionListSelectedValues[column.field] = data.dateFormat;
                             DialogProvider.close();
                             setTimeout(()=>{
                                 resolve(column);
@@ -1049,6 +1103,7 @@ export default class CommonDatagridComponent extends AppComponent {
                 this.prepareData({data:this.INITIAL_STATE.data,sectionListColumns:pSListColumns},(state)=>{
                     this.setState({...state,sectionListColumns:pSListColumns},()=>{
                         this.setIsLoading(false,false);
+                        this.setSessionData("sectionListColumns",Object.keys(pSListColumns));
                     });
                 });
             },true);
@@ -1058,7 +1113,7 @@ export default class CommonDatagridComponent extends AppComponent {
                 return cb();
             }
             return this.configureSectionListColumn(sectionListColumns[columnName]).then(cb).catch(notify.error)
-        }, 200);
+        }, 100);
    }
    removeAllColumnsInSectionList(){
         const {sectionListColumns} = this.prepareColumns({sectionListColumns:{}});
@@ -1066,16 +1121,106 @@ export default class CommonDatagridComponent extends AppComponent {
             this.prepareData({data:this.INITIAL_STATE.data,sectionListColumns},(state)=>{
                 this.setState({...state,sectionListColumns},()=>{
                     this.setIsLoading(false,false);
+                    this.setSessionData("sectionListColumns",null);
                 });
             });
         },true);
    }
+   canDisplayOnlySectionListHeaders(){
+        return this.hasFooterFields() && this.isSectionList() && this.hasSectionListData();
+   }
+   /*** si l'on peut rendre le contenu de type graphique */
+   isChartRendable(){
+     return !this.isPivotDatagrid() && this.hasFooterFields()  && this.isSectionList();
+   }
+   canRenderChart(){
+        return this.isChartRendable() && this.state.displayType.toLowerCase().contains("chart");
+   }
+   /***modifie le type de données d'affichage du tableau */
+   setDisplay(type){
+        if(!isObj(type) || !isNonNullString(type.code) || !displayTypes[type.code]) return;
+        const tt = displayTypes[type.code];
+        if(tt.code == 'table'){
+            if(this.state.displayType == 'table') return;
+            return this.setIsLoading(true,()=>{
+                this.setState({displayTypes:'table'},()=>{
+                    this.setIsLoading(false,false);
+                });
+            },true)
+        } else {
+            DialogProvider.open({
+                title : 'Configuration de la courbe'
+            })
+        }
+   }
+   renderDisplayTypes(){
+        const m = [];
+        let activeType = null;
+        Object.map(this.displayTypes,(type,k)=>{
+            let c = k.toLowerCase();
+            if(c.contains('chart') && !this.isChartRendable()) return null;
+            const active = this.state.displayType === k;
+            if(active){
+                activeType = type;
+            }
+            m.push({
+                ...type,
+                labelStyle : active &&  {fontWeight:'bold',color:theme.colors.primaryOnSurface} || null,
+                onPress:()=>{
+                    this.setDisplay(type); 
+                }
+            })
+        });
+        if(m.length <= 1 || !activeType) return null;
+        if(!isMobileOrTabletMedia()){
+            m.unshift({text:"Type d'affichage des données",divider:true});
+        }
+        return <Menu
+            title = "Type d'affichage"
+            items = {m}
+            anchor = {(p)=>{
+                return <Icon
+                    {...p}
+                    name = {activeType.icon}
+                    title = {"Les données s'affichent actuellement en {0}. Cliquez pour modifier le type d'affichage".sprintf(activeType.label)}
+                />
+            }}
+        />
+   }
+   renderChart(){
+        if(!this.canRenderChart()) return null;
+   }
+   toggleDisplayOnlySectionListHeaders(){
+        if(!this.canDisplayOnlySectionListHeaders()) return
+        setTimeout(()=>{
+            const displayOnlySectionListHeaders = !!!this.state.displayOnlySectionListHeaders;
+            this.setSessionData("displayOnlySectionListHeaders",displayOnlySectionListHeaders);
+            if(!displayOnlySectionListHeaders){
+                return this.prepareData({data:this.INITIAL_STATE.data,displayOnlySectionListHeaders},(state)=>{
+                    this.setState(state)
+                })
+            } else {
+                this.setIsLoading(true,()=>{
+                    const data = [];
+                    this.state.data.map((d)=>{
+                        if(isObj(d) && d.isSectionListHeader === true){
+                            data.push(d);
+                        }
+                    });
+                    this.setState({data,displayOnlySectionListHeaders},()=>{
+                        this.setIsLoading(false),false;
+                    });
+                },true)
+            }
+        },100);
+   }
    /*** permet d'effectuer le rendu des colonnes groupable dans le menu item */
    renderSectionListMenu(){
         const m = Array.isArray(this.preparedColumns?.sectionListColumnsMenuItems)? this.preparedColumns?.sectionListColumnsMenuItems : [];
         if(!m.length){
             return null;
         }
+        const hasList = this.sectionListColumnsSize.current;
         const isMobile = isMobileOrTabletMedia();
         return <Menu
             title = {"Grouper les données du tableau"}
@@ -1090,14 +1235,19 @@ export default class CommonDatagridComponent extends AppComponent {
                     closeOnPress : false,
                     divider : true,
                 },
-                this.sectionListColumnsSize.current && {
+                this.canDisplayOnlySectionListHeaders() && {
+                    text : "Afficher uniquement totaux",
+                    icon : this.state.displayOnlySectionListHeaders?"check":null,
+                    onPress : this.toggleDisplayOnlySectionListHeaders.bind(this)
+                },
+                hasList && {
                     text : "Supprimer les groupes",
                     icon: "ungroup",
                     divider : true,
                     onPress : ()=>{
                         setTimeout(()=>{
                             this.removeAllColumnsInSectionList();
-                        },300)
+                        },100)
                     }
                 },
                 ...m,
@@ -1176,7 +1326,7 @@ export default class CommonDatagridComponent extends AppComponent {
                 onPress : ()=>{
                     setTimeout(() => {
                         this.toggleColumnVisibility(header.field);
-                    },300);
+                    },100);
                     return false;
                 },
                 title : title,
@@ -1311,9 +1461,9 @@ export default class CommonDatagridComponent extends AppComponent {
    getFooterValues(){
         return defaultObj(this.___evaluatedFootersValues);
    }
-   
+
    /**** s'il s'agit d'une section list */
-   isSectionList(sectionListColumns){
+   isSectionList (sectionListColumns){
         sectionListColumns = isObj(sectionListColumns) ? sectionListColumns : this.state.sectionListColumns;
         return !this.isPivotDatagrid() && isObj(sectionListColumns) && Object.size(sectionListColumns,true) ? true : false;
    }
@@ -1338,13 +1488,14 @@ export default class CommonDatagridComponent extends AppComponent {
         return defaultNumber(this.sectionListDataSize.current)
     }
     prepareData(args,cb){
-        let {pagination,data,force,sectionListColumns,updateFooters} = defaultObj(args);
+        let {pagination,displayOnlySectionListHeaders:cdisplayOnlySectionListHeaders,data,force,sectionListColumns,updateFooters} = defaultObj(args);
         cb = typeof cb ==='function'? cb : typeof args.cb == 'function'? args.cb : undefined;
         sectionListColumns = isObj(sectionListColumns) ? sectionListColumns : this.state.sectionListColumns;
+        const displayOnlySectionListHeaders = typeof cdisplayOnlySectionListHeaders == 'boolean'?cdisplayOnlySectionListHeaders : this.state.displayOnlySectionListHeaders;
         let isArr = Array.isArray(data);
         //let push = (d,index) => isArr ? newData.push(d) : newData[index] = d;
         const hasLocalFilter = this.props.filters !== false && this.hasLocalFilters;
-        let footersColumns = this.getFooterFields(),hasFooterFields = Object.size(footersColumns,true);
+        let footersColumns = this.getFooterFields(),hasFooterFields = this.hasFooterFields();
         const canUpdateFooters = !!(updateFooters !== false && hasFooterFields);
         this.hasFoundSectionData.current = false;
         this.sectionListDataSize.current = 0;
@@ -1427,9 +1578,11 @@ export default class CommonDatagridComponent extends AppComponent {
                 //this.sectionListData[i] = sortConfig ? sortBy(this.sectionListData[i],sortConfig):this.sectionListData[i];
                 //const v = i;// === this.emptySectionListHeaderValue ? "" : i;
                 data.push({isSectionListHeader:true,sectionListHeaderKey:i});
-                this.sectionListData[i].map((d)=>{
-                    data.push(d);
-                })
+                if(!displayOnlySectionListHeaders){
+                    this.sectionListData[i].map((d)=>{
+                        data.push(d);
+                    })
+                }
             }
         } 
         if(!this.hasSectionListData() && this.canPaginateData()){
@@ -1441,7 +1594,7 @@ export default class CommonDatagridComponent extends AppComponent {
         } else if(force){
             this.setSelectedRows();
         }
-        const state = {data};
+        const state = {data,displayOnlySectionListHeaders};
         if((cb)){
             cb(state);
         }
@@ -1896,7 +2049,7 @@ export default class CommonDatagridComponent extends AppComponent {
         }
         cb && setTimeout(() => {
             cb();
-        }, 500);
+        }, 200);
     }
     isAllRowsSelected(update){
         return this.selectedRowsCount && this.selectedRowsCount === this.getMaxSelectableRows()? true : false;
@@ -2271,7 +2424,7 @@ export const ProgressBar = CommonDatagridComponent.LinesProgressBar;
 CommonDatagridComponent.getDefaultPreloader = (props)=>{
     return <Preloader {...defaultObj(props)}/>
 }
-
+const allDTypes = Object.keys(displayTypes);
 CommonDatagridComponent.propTypes = {
     canMakePhoneCall : PropTypes.bool,//si l'on peut faire un appel sur la données sélectionnées
     makePhoneCallProps : PropTypes.oneOfType([
@@ -2448,6 +2601,13 @@ CommonDatagridComponent.propTypes = {
     /**** la fonction permettant de faire le rendu dun contenu paginé, personalisé */
     renderCustomPagination : PropTypes.func,
     getActionsArgs : PropTypes.func,//fonction permettant de récupérer les props supplémentaires à passer aux actions du datagrid
+    displayOnlySectionListHeaders : PropTypes.bool,// si uniquement les entêtes des sections seront affichés, valides uniquement en affichage des sectionHeader 
+
+    /*** types d'affichage displayTypes */
+    /** les types d'affichage supportés */
+    displayType : PropTypes.oneOf(allDTypes),
+    /*** les types d'afichates supportés par l'application */
+    displayTypes : PropTypes.arrayOf(PropTypes.oneOf(allDTypes)) 
 }
 
 const styles = StyleSheet.create({

package/src/components/Datagrid/Common/readMe.txt

@@ -0,0 +1,12 @@
+// 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.
+
+Les propriétés d'états : 
+    displayType, displayOnlySectionListHeaders, sectionListHeaderColumns sont persistées    
+    ça sous entend que lorsqu'on charge la table data, ces valeurs sont restaurées
+
+- Pour faire un affichage en graphique, il faut :    
+    1. grouper les éléments du tableau avec au moins une colonne
+    2. disposer dans le tableau, des colonnes de totalisation (de type montant et somme)
+    3.  

package/src/components/Datagrid/Table/index.js

@@ -284,6 +284,7 @@ const DatagridFactory = (Factory)=>{
                         
                         />
                         {this.renderSectionListMenu()}
+                        {this.renderDisplayTypes()}
                         <View testID={testID+"_HeaderPagination"} style = {styles.paginationItem}>
                             <BottomSheetMenu
                                 testID={testID+"_HeaderMenus"}

package/src/components/Date/FormatSelector.js

@@ -82,14 +82,15 @@ export const selectDateFormatFieldProps = ({onAdd:customOnAdd,onAddCustomFormat,
         ...defaultObj(props),
         onAdd,
         onAdd : undefined,
+        showAdd : false,
     }
 }
-export const getDateFormatSelectorItems = x=> Object.map(DateLib.formats,(format)=>{
+export const getDateFormatSelectorItems = x=> Object.map(DateLib.sortedFormats,(format)=>{
     return {code : format,label:new Date().toFormat(format)}
 });
 
 export const dateFormatSelectorRenderItem = ({item})=>{
-    return "{0}, EX : {1}".sprintf(item.code,item.label);
+    return "{0} [{1}]".sprintf(item.label,item.code);
 }
 
 DateFormatSelector.propTypes = {

package/src/components/Form/Fields/SelectField.js

@@ -2,6 +2,7 @@ import Field from "./Field";
 import Dropdown from "$ecomponents/Dropdown";
 import PropTypes from "prop-types";
 import {isObj} from "$utils";
+import appConfig from "$capp/config";
 
 export default class FormSelectField extends Field{
     constructor(props) {
@@ -115,8 +116,9 @@ export default class FormSelectField extends Field{
         delete props.format;
         delete props.import;
         delete props.exports;
-        if( defaultStr(props.name,this.name) === 'country' && props.multiple !== true){
-            props.defaultValue = defaultStr(props.defaultValue);
+        const isCountry = this.type.contains('country');
+        if( isCountry && props.multiple !== true){
+            props.defaultValue = defaultStr(props.defaultValue,appConfig.countryCode,appConfig.get("countryCode","country"));
         }
         return <Dropdown
             {...props}

package/src/components/Form/Fields/Tel.js

@@ -1,5 +1,6 @@
 import PhoneInput from "$ecomponents/PhoneInput";
 import Field from "./Field";
+import appConfig from "$capp/config";
 
 export default class FormPhoneInputField extends Field {
     canFocus(){
@@ -9,6 +10,7 @@ export default class FormPhoneInputField extends Field {
         props.onChange = (args)=>{
             this.validate(args);
         }
+        props.country = defaultStr(props.country,appConfig.countryCode,appConfig.get("countryCode","country"))
         return <PhoneInput
             {...props}
             setRef = {setRef}

package/src/components/Menu/Item.js

@@ -27,12 +27,13 @@ const MenuItemComponent = React.forwardRef(({
   style,
   contentStyle,
   testID,
-  titleStyle,
+  labelStyle,
   primary,
   secondary,
   iconProps,
   isBottomSheetItem,
   accessibilityLabel,
+  right,
   ...rest
 },ref) => {
   title = defaultVal(label,text,title);
@@ -49,20 +50,20 @@ const MenuItemComponent = React.forwardRef(({
     ? disabledColor
     : color(theme.colors.text).alpha(theme.ALPHA).rgb().string();
   iconProps = defaultObj(iconProps);
-  titleStyle = Object.assign({},StyleSheet.flatten(titleStyle));
+  labelStyle = Object.assign({},StyleSheet.flatten(labelStyle));
   style = Object.assign({},StyleSheet.flatten(style));
 
-  if(Colors.isValid(titleStyle.color)){
-     iconColor = titleStyle.color;
+  if(Colors.isValid(labelStyle.color)){
+     iconColor = labelStyle.color;
   } else if(Colors.isValid(style.color)){
     titleColor = iconColor = style.color;
   }
-
   const pointerEvents = disabled ? 'none' : 'auto';
   const disabledStyle = disabled ? {opacity:DISABLED_OPACITY} : null;
   const winW = Dimensions.get("window").width-30;
   const maxWidthStyle = isBottomSheetItem ? {width:winW,maxWidth:null} : undefined;
   const maxWidthTextStyle = isBottomSheetItem ? {width:winW-50} : null;
+  right = typeof right =='function'? right ({color:titleColor}) : right;
   return (
     <Tooltip
       {...defaultObj(rest)}
@@ -77,13 +78,14 @@ const MenuItemComponent = React.forwardRef(({
       accessibilityState={{ disabled }}
       pointerEvents = {pointerEvents}
     >
-      <View style={[styles.row]} ref={ref}>
+      <View style={[styles.row]} ref={ref} testID={testID+"_ContentContainer"}>
         {icon ? (
-          <View style={[styles.item, styles.icon]} pointerEvents="box-none">
+          <View testID={testID+"_IconContainer"} style={[styles.item, styles.icon]} pointerEvents="box-none">
             <Icon source={icon} size={24} {...iconProps} style={[iconProps.style,styles.iconT]} color={iconColor} />
           </View>
         ) : null}
         <View
+          testID={testID+"_LabelContainer"}
           style={[
             styles.item,
             styles.content,
@@ -95,14 +97,16 @@ const MenuItemComponent = React.forwardRef(({
           pointerEvents="none"
         >
           <Label
+            testID={testID+"_Label"}
             selectable={false}
             numberOfLines={1}
             ellipsizeMode = {"tail"}
-            style={[styles.title, { color: titleColor }, titleStyle,styles.noMargin,maxWidthTextStyle]}
+            style={[styles.title, { color: titleColor }, labelStyle,styles.noMargin,maxWidthTextStyle]}
           >
             {title}
           </Label>
         </View>
+        {React.isValidElement(right) && right || null}
       </View>
     </Tooltip>
   );
@@ -185,7 +189,7 @@ MenuItemComponent.propTypes = {
      */
     style: StylePropTypes,
     contentStyle: StylePropTypes,
-    titleStyle : StylePropTypes,
+    labelStyle : StylePropTypes,
     /**
      * @optional
      */