@fto-consult/expo-ui 7.1.7 → 7.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "7.1.7",
+  "version": "7.2.1",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "main",
   "scripts": {
@@ -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.71.30",
+    "@fto-consult/common": "^3.72.15",
     "@pchmn/expo-material3-theme": "^1.3.1",
     "@react-native-async-storage/async-storage": "1.18.2",
     "@react-native-community/datetimepicker": "7.2.0",

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

@@ -247,6 +247,9 @@ const styles = StyleSheet.create({
     contentContainerNotAvatar : {
         paddingLeft : 2,
     },
+    content : {
+        maxWidth : "70%",
+    },
 });
 
 DatagridAccordionRow.displayName = 'DatagridAccordionRow';

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

@@ -826,7 +826,7 @@ export default class CommonDatagridComponent extends AppComponent {
      *   ou pas.
      */
     renderSelectedRowsActions(sActions){
-        let {printOptions,makePhoneCallProps,printable,print,archive,canMakePhoneCall,archivable} = this.props;
+        let {makePhoneCallProps,canMakePhoneCall,archivable} = this.props;
         const size = this.getSelectedRowsCount();
         let r = [];
         let endActs = [];
@@ -841,20 +841,6 @@ export default class CommonDatagridComponent extends AppComponent {
         if(isFunction(selectedR)) {
             selectedR = selectedR.call(this,sArgs)
         }
-        if(isFunction(print)){
-            if(isFunction(printable)){
-                printable = printable({context:this,tableName:defaultStr(this.props.tableName,this.props.table),props:this.props});
-            }
-            if(printable !== false){
-                r.push({
-                    icon : defaultVal(this.props.printButtonIcon,'printer'),
-                    text : defaultVal(this.props.printButtonText,this.props.printButtonLabel,'Imprimer'),
-                    onPress : ()=>{
-                        print({title:defaultStr(this.props.title),...defaultObj(printOptions),...sArgs});
-                    },
-                })
-            }
-        }
         Object.map(sActions,(o,i)=>{
             if(isObj(o)){
                 let {onPress, ...rest} = o;
@@ -1790,6 +1776,10 @@ export default class CommonDatagridComponent extends AppComponent {
                         defaultValue : 0,
                         type : "switch",
                     }  : null,
+                    pdfDocumentTitle : {
+                        text : "Titre du document",
+                        multiple : true,
+                    },
                     ...sFields,
                 },
                 actions : [{text:'Exporter',icon : "check"}],
@@ -1844,7 +1834,7 @@ export default class CommonDatagridComponent extends AppComponent {
         if(pdfDocumentTitle){
             content.unshift(pdfDocumentTitle);
         }
-        const pdf = createPDF({content},config);
+        const pdf = createPDF({...config,content});
         if(isWeb()){
             return pdf.open();
         }
@@ -4006,12 +3996,6 @@ CommonDatagridComponent.propTypes = {
     ]),
     /*** fonction permettant de retourner l'unique clé des éléments du tableau */
     getRowKey : PropTypes.func,
-    ///la fonction utilisée pour l'impression du datagrid
-    print : PropTypes.func,
-    printButtonIcon : PropTypes.oneOfType([PropTypes.string,PropTypes.element]),
-    printButtonLabel : PropTypes.oneOfType([PropTypes.string,PropTypes.element]),
-    printButtonText : PropTypes.oneOfType([PropTypes.string,PropTypes.element]),
-    printOptions: PropTypes.object,
     /*** si le datagrid est imprimable */
     printable : PropTypes.oneOfType([
         PropTypes.func,

package/src/components/Filter/index.js

@@ -18,6 +18,7 @@ import { ActivityIndicator } from "react-native-paper";
 import DialogProvider from "$ecomponents/Form/FormData/DialogProvider";
 import FilterBetweenComponent from "./BetweenComponent";
 
+export const dateTypes = ["date","time","datetime","date2time"]
 
 const manualRunKey = "manual-run";
 
@@ -137,7 +138,9 @@ export default class Filter extends AppComponent {
       type = defaultStr(type,this.type,this.props.type).toLowerCase();
       if(type.contains('select')){
           return "$in";
-      } if(type !== 'date2time' && type !=="date" && type !== 'time' && type !== 'number' && type !== 'decimal'){
+      } 
+      if(dateTypes.includes(type)) return "$eq";
+      if(type !== 'number' && type !== 'decimal'){
           return '$regexcontains';
       }
       return '$eq';
@@ -161,16 +164,16 @@ export default class Filter extends AppComponent {
         action = '$eq';
     } else if(type.contains('select')){
         actions = _inActions;
-    } else if(type == 'date' || type =='datetime') {
+    } else if(dateTypes.includes(type)) {
       actions = {...periodActions, ...actions}  
       delete actions.$between;
-    } else if(type !== 'date2time' && type !== 'time' && type !== 'number' && type !== 'decimal'){
+    } else if(type !== 'number' && type !== 'decimal'){
         actions = {...betweenActions,...regexActions};
         isTextFilter = true;
     }
     if(!action){
         action = this.getDefaultAction(type);
-    } 
+    }
     let defaultValue = defaultVal(this.props.defaultValue);
     operator = defaultVal(operator,"$and");
     if(actions == _inActions || type.contains("select")){

package/src/components/Form/FormData/FormDataActions.js

@@ -103,7 +103,7 @@ export default class FormDataActionComponent extends FormData {
     }
     getAppBarActionsProps(props){
         props = defaultObj(props,this.props);
-        let {actions,save2NewAction,save2printAction,save2closeAction,saveAction,newAction} = props;
+        let {actions,save2NewAction,save2printAction,isPrintingForm,save2closeAction,saveAction,newAction} = props;
         const sArg = {context:this};
         save2NewAction = typeof save2NewAction =='function' ? save2NewAction (sArg) : save2NewAction;
         save2closeAction = typeof save2closeAction ==='function'? save2closeAction(sArg) : save2closeAction;
@@ -113,7 +113,7 @@ export default class FormDataActionComponent extends FormData {
         const appBarProps = this.getAppBarProps();
         const data = this.getDataProp();
         const isEditing = this.isDocEditing(data);
-        let textSave = isEditing ? "Modifier": 'Enregistrer';
+        let textSave = isPrintingForm ? "Imprimer" : isEditing ? "Modifier": 'Enregistrer';
         const newElementLabel = defaultStr(props.newElementLabel,this.props.newElementLabel,"Nouvel Element");
         if(isEditing){
             const t = this.getPrimaryKeysFieldsValueText(data);
@@ -142,7 +142,7 @@ export default class FormDataActionComponent extends FormData {
                 save : saveAction !== false ? {
                     isAction : true,
                     text : textSave,
-                    icon : 'check',
+                    icon : isPrintingForm ? 'printer':'check',
                     title : textSave,
                     onPress : (a)=>{
                         context.clickedAction = 'save';

package/src/layouts/Screen/TableData.js

@@ -350,7 +350,7 @@ export default class TableDataScreenComponent extends FormDataScreen{
             saveButton : isUpdated?'Modifier':'Enregistrer',
             currentData:data,
             hasManyData : this.hasManyData(),
-            //onPressToPrint : this.print.bind(this),
+            onPressToPrint : this.print.bind(this),
             datas,
             currentDataIndex:currentIndex,
             onPressToPrevious:this.goToPreviousData.bind(this),
@@ -581,9 +581,12 @@ export default class TableDataScreenComponent extends FormDataScreen{
         return super.isDocEditing(data);
     }
     print(data){   
-        if(!this.isPrintable() && typeof this.props.print !=='function') return;
+        if(!this.isPrintable()) return;
         data = this.isDocEditing(data)? data : isObj(data) && this.isDocEditing(data.data)? data.data : {};
-        return this.props.print(data,this);
+        if(typeof this.props.print ==='function'){
+            return this.props.print.call(this,data);
+        }
+        return data;
     }
     isClonable(){
         return !!(this.props.clonable !==false);

package/src/pdf/index.js

@@ -9,6 +9,7 @@ import session from "$session";
 
 const {createPdf} = pdfMake;
 pdfMake.createPdf = (docDefinition,...rest)=>{
+    console.log("creating pdf ",docDefinition);
     try {
         //@see : https://pdfmake.github.io/docs/0.1/getting-started/client-side/methods/
         const pdf = createPdf(docDefinition,...rest);
@@ -43,14 +44,7 @@ export const print = (data,options,...rest)=>{
 
 export const getFields = (config)=>{
     config = Object.assign({},config);
-    const sFields = extendObj({},{
-        pdfDocumentTitle : {
-            text : "Titre du document",
-            multiple : true,
-        }
-    },pdfFields);
-    delete sFields.code;
-    delete sFields.label;
+    const sFields = Object.clone(pdfFields);
     if(!isDataURL(config.logo)){
         delete sFields.displayLogo;
         delete sFields.logoWidth;
@@ -80,6 +74,7 @@ export const getPrintSettings = ({multiple,sessionName,formDataProps,...rest})=>
             onValidate : ({value,context}) =>{
                 if(context){
                     const pageBreakBeforeEachDoc = context.getField("pageBreakBeforeEachDoc");
+                    const pageMarginAfterEachDoc = context.getField("pageMarginAfterEachDoc");
                     if(pageBreakBeforeEachDoc){
                         if(value || multiple){
                             pageBreakBeforeEachDoc.enable();
@@ -87,6 +82,13 @@ export const getPrintSettings = ({multiple,sessionName,formDataProps,...rest})=>
                             pageBreakBeforeEachDoc.disable();
                         }
                     }
+                    if(pageMarginAfterEachDoc){
+                        if(value || multiple){
+                            pageMarginAfterEachDoc.enable();
+                        } else {
+                            pageMarginAfterEachDoc.disable();
+                        }
+                    }
                 }
             }
         },
@@ -104,12 +106,29 @@ export const getPrintSettings = ({multiple,sessionName,formDataProps,...rest})=>
                 }
                 return v;
             }
-        }
+        },
+        pageMarginAfterEachDoc : {
+            text : "Marge après chaque document",
+            tooltip : 'Spécifiez le nombre de ligne à ajouter comme marge après chaque document',
+            defaultValue : 2,
+            type : "number",
+            getValidValue : ({context,data}) => {
+                if(!context || !context?.isDisabled) {
+                    return 0;
+                }
+                const v = context?.isDisabled()?0 : context.getValue();
+                if(isObj(data)){
+                    data.pageMarginAfterEachDoc = v;
+                }
+                return v;
+            }
+        },
     },getFields(formDataProps.data))
     return new Promise((resolve,reject)=>{
         return DialogProvider.open({
             title : "Options d'impression",
             ...formDataProps,
+            isPrintingForm : true,
             data : config,
             fields,
             onSuccess : (opts)=>{
@@ -122,7 +141,7 @@ export const getPrintSettings = ({multiple,sessionName,formDataProps,...rest})=>
                     session.set(sessionName,sessionD);
                 }
                 DialogProvider.close();
-                resolve({...opts,fields});
+                resolve({...opts,data,fields});
             },
             onCancel : reject,
         })