@fto-consult/expo-ui 7.6.30 → 7.6.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "7.6.30",
+  "version": "7.6.32",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "scripts": {
     "clear-npx-cache": "npx clear-npx-cache",
@@ -71,7 +71,7 @@
     "@expo/html-elements": "^0.5.1",
     "@expo/vector-icons": "^13.0.0",
     "@faker-js/faker": "^8.0.2",
-    "@fto-consult/common": "^3.73.15",
+    "@fto-consult/common": "^3.73.29",
     "@fto-consult/electron": "^1.0.27",
     "@pchmn/expo-material3-theme": "^1.3.1",
     "@react-native-async-storage/async-storage": "1.18.2",

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

@@ -295,7 +295,6 @@ export default class CommonDatagridComponent extends AppComponent {
         this.INITIAL_STATE = {
             data,
         }
-        this.prepareFetchData();
         this._datagridId = isNonNullString(this.props.id)? this.props.id : uniqid("datagrid-id")
         this.canDoFilter = true;    
         this.filters =  {}
@@ -1823,7 +1822,9 @@ export default class CommonDatagridComponent extends AppComponent {
     return this.SetExportOptions({excel:false,pdf:true}).then((opts)=>{
         const {data,config:cConfig,pdfConfig} = opts;
         const config = extendObj({},pdfConfig,cConfig);
-        data[0] = createTableHeader(data[0],config);
+        data[0] = createTableHeader(data[0],{...config,filter:(a)=>{
+            return true;
+        }});
         const pT = defaultStr(config.pdfDocumentTitle).trim();
         const pdfDocumentTitle = pT ? pdfSprintf(pT,{fontSize : 20,color : "red"}) : null;
         const content = [{
@@ -1859,8 +1860,8 @@ export default class CommonDatagridComponent extends AppComponent {
         const hasFields = !!config.fields.length;
         const fields = config.fields;
         const headers = [];
+        const fValues = this.getFooterValues();
         if(displayOnlyHeader && config.aggregatedValues){
-            const fValues = this.getFooterValues();
             headers.push("Fonction d'agrégation");
             const aggregatorFunctions = this.aggregatorFunctions;
             Object.map(footers,(f,i)=>{
@@ -1875,7 +1876,8 @@ export default class CommonDatagridComponent extends AppComponent {
                 const d = [defaultStr(ag.label,ag.text,i)];
                 Object.map(fValues,(footer,field)=>{
                     if(!cols[field]) return;
-                    d.push(defaultNumber(footer[i]))
+                    const v = defaultNumber(footer[i]);
+                    d.push(pdf ? this.formatValue(v,footer.format,field):v);
                 });
                 data.push(d);
             })
@@ -1884,41 +1886,76 @@ export default class CommonDatagridComponent extends AppComponent {
             const agFunc = this.state.aggregatorFunction;
             const canExportOnlyTotal = isOnlytotal || (config.exportOnlyTotal && displayOnlyHeader);
             if(canExportOnlyTotal){
-                headers.push("");
+                headers.push(pdf?{text:""}:"");
             }
             Object.map(this.state.columns,(col,i)=>{
                 if(hasFields && !fields.includes(i)) return;
                 if(!isObj(col) || col.visible === false || this.isSelectableColumn(col,i) || i === this.getIndexColumnName()) return;
                 if(canExportOnlyTotal && !(i in footers)) return;
                 cols[i] = col;
-                headers.push(defaultStr(col.label,col.text));
+                const textVal = defaultStr(col.label,col.text);
+                if(pdf && !textVal){
+                    headers.push({text:""});
+                } else {
+                    headers.push(textVal);
+                }
                 totalColumns++;
             });
             data.push(headers);
+            if(canExportOnlyTotal && isNonNullString(agFunc)){
+                const totalFooter = [pdf?{text:"TOTAUX",fontSize:16,bold:true}:"TOTAUX"];
+                Object.map(fValues,(f,i)=>{
+                    if(!isObj(f) || hasFields && !fields.includes(i) || !(agFunc in f)) return;
+                    const vNum = defaultNumber(f[agFunc]);
+                    const text = pdf ? this.formatValue(vNum,f.format,i) : vNum;
+                    totalFooter.push(pdf?{text,bold:true,fontSize:15,alignment:"center",color:"red"}:text);
+                });
+                data.push(totalFooter);
+            }
             Object.map(this.state.data,(dat,index)=>{
                 ///si l'on a a faire à une colonne de type entete
                 const d = [];
                 if(dat.isSectionListHeader){
                     if(!config.displayTotals && !canExportOnlyTotal) return;
                     const {sectionListHeaderKey:key} = dat;
-                    const val = key === this.emptySectionListHeaderValue ? this.getEmptySectionListHeaderValue() : key;
+                    let val = key === this.emptySectionListHeaderValue ? this.getEmptySectionListHeaderValue() : key;
+                    if(pdf){
+                        val = {text : val, colSpan :totalColumns,bold:true,fontSize:15};
+                    }
                     d.push(val);
                     if(!canExportOnlyTotal){
                         for(let i = 1;i<totalColumns;i++){
                             d.push(null);
                         }
                         data.push(d);
+                        const hF = hFooters[key];
+                        if(isObj(hF) && isNonNullString(agFunc)){
+                            const totalSectionFooter = [];
+                            Object.map(cols,(col,i)=>{
+                                if(i in hF){
+                                    const ff = hF[i];
+                                    const vNum = defaultNumber(ff[agFunc]);
+                                    const text = pdf ? this.formatValue(vNum,col.format,i) : vNum;
+                                    totalSectionFooter.push(pdf?{text,bold:true,fontSize:15,alignment:"center"}:text);
+                                } else {
+                                    totalSectionFooter.push(null);
+                                }
+                            });
+                            data.push(totalSectionFooter);
+                        }
                     } else {
                         const hF = hFooters[key];
                         if(isObj(hF) && isNonNullString(agFunc)){
                             const dd = [];
                             Object.map(cols,(col,i)=>{
                                 if(i in hF){
-                                        const ff = hF[i];
-                                        dd.push(defaultNumber(ff[agFunc]));
-                                    } else {
-                                        dd.push(null);
-                                    }
+                                    const ff = hF[i];
+                                    const vNum = defaultNumber(ff[agFunc]);
+                                    const text = pdf ? this.formatValue(vNum,col.format,i) : vNum;
+                                    dd.push(pdf?{text,bold:true,fontSize:15,alignment:"center"}:text);
+                                } else {
+                                    dd.push(null);
+                                }
                             });
                             if(canExportOnlyTotal){
                                 dd.unshift(val);
@@ -1928,6 +1965,9 @@ export default class CommonDatagridComponent extends AppComponent {
                                 data.push(dd);
                             }
                         } else {
+                            if(canExportOnlyTotal){
+                                d.push(null);
+                            }
                             data.push(d);
                         }
                     }
@@ -1939,7 +1979,7 @@ export default class CommonDatagridComponent extends AppComponent {
                             rowData : dat,
                             rowCounterIndex : index,
                             rowIndex : index,
-                            formatValue : false,
+                            formatValue : !pdf,
                             renderRowCell : false,
                             columnField : defaultStr(col.field,i),
                             columnDef :{
@@ -3243,9 +3283,6 @@ export default class CommonDatagridComponent extends AppComponent {
         this.refresh(true);
         this.previousDataSources = dataSources;
     }
-    prepareFetchData(fetchData){
-        this.INITIAL_STATE.fetchData = defaultVal(fetchData,this.props.fetchData);
-    }
     beforeFetchData(){}
         /**** retourne la liste des items, utile lorsqu'une s'agit d'une fonction 
         Lorsque data est une chaine de caractère, alors elle doit être sous la forme recommandée par la function 
@@ -3290,7 +3327,7 @@ export default class CommonDatagridComponent extends AppComponent {
                 if(force !== true && isArray(this.INITIAL_STATE.data)) {
                     return this.resolveFetchedDataPromise({cb,data:this.INITIAL_STATE.data}).then(resolve).catch(reject)
                 }
-                let fetchData  = this.INITIAL_STATE.fetchData;
+                let fetchData  = undefined;
                 if(isFunction(this.props.fetchData)){
                     /**** l'on peut définir la props fetchData, qui est la fonction appelée pour la recherche des données */
                     fetchData = this.props.fetchData.call(this,fetchOptions);
@@ -3381,7 +3418,7 @@ export default class CommonDatagridComponent extends AppComponent {
             this._pagination.page = 1;
             this._pagination.start = 0;
         }
-        return this.fetchData({force:true});
+        return this.fetchData({force:true,renderProgressBar:true});
     }
     onSetQueryLimit(){
         if(!this.canSetQueryLimit()) return;

package/src/components/Datagrid/SWRDatagrid.js

@@ -208,7 +208,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
     const dataRef = React.useRef(null);
     const totalRef = React.useRef(0);
     const prevIsLoading = React.usePrevious(isLoading);
-    const loading = (customIsLoading === true || isLoading || (prevIsLoading && isValidating && showProgressRef.current));
+    const loading = (customIsLoading === true || isLoading || (isValidating && showProgressRef.current));
     const {data,total} = React.useMemo(()=>{
         if((loading && customIsLoading !== false) || !isObjOrArray(result)){
             return {data:dataRef.current,total:totalRef.current};
@@ -235,8 +235,10 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
         },500);
     },[error]);
     const doRefresh = (showProgress)=>{
-        showProgressRef.current = showProgress ? typeof showProgress ==='boolean' : false;
-        refresh();
+        showProgressRef.current = showProgress || typeof showProgress ==='boolean' ? showProgress : false;
+        const fPath = isNonNullString(fetchPath)? fetchPath : fPathRef.current;
+        const rKey = `${setQueryParams(fPath,"swrRefreshKeyId",uniqid("swr-refresh-key"))}`;
+        refresh(rKey,data);
     }
     const canPaginate = ()=>{
         if(!canHandlePagination) return false;