v20240527 1

diff --git a/public_html/config.prod.php b/public_html/config.prod.php
index caec704..9ccfa1c 100644 (file)
--- a/public_html/config.prod.php
+++ b/public_html/config.prod.php
@@ -10,12 +10,12 @@ $cfg["city"] = "EHLANGE-SUR-MESS";
 $cfg["iban"] = "LU080019435512770000";
 $cfg["bic"] = "BCEELULL";
 $cfg["db"]["type"] = "mysql";
-$cfg["db"]["dbname"] = "atspsoft_nglsnep";
+// $cfg["db"]["dbname"] = "atspsoft_nglsnep";
+// $cfg["db"]["host"] = "10.8.0.9";
+// $cfg["db"]["user"] = 'root';
+// $cfg["db"]["password"] = 'nglsnep2024';
+$cfg["db"]["dbname"] = "atsoft_nglsnep2";
 $cfg["db"]["host"] = "localhost";
-$cfg["db"]["user"] = 'root';
-$cfg["db"]["password"] = 'nglsnep2024';
-// $cfg["db"]["dbname"] = "atsoft_nglsnep2";
-// $cfg["db"]["host"] = "localhost";
-// $cfg["db"]["user"] = 'nglsnep';
-// $cfg["db"]["password"] = '7tDVxS5YF5em956q';
+$cfg["db"]["user"] = 'nglsnep';
+$cfg["db"]["password"] = '7tDVxS5YF5em956q';
 ?>
\ No newline at end of file

diff --git a/public_html/lib/App/Members.php b/public_html/lib/App/Members.php
index ab17559..f1fabe4 100644 (file)
--- a/public_html/lib/App/Members.php
+++ b/public_html/lib/App/Members.php
@@ -21,7 +21,7 @@ class Members extends stdClass {
     } else  {
       return array();
     }
-    $sql= "SELECT ID_member as id, code1,lastname,firstname,securitysocialnumber,
+    $sql= "SELECT ID_member as id, lastname,firstname,securitysocialnumber,
     CONCAT(coalesce(lastname,''),' ',coalesce(firstname,''),'<br/>',coalesce(ID_member,''),' / ',coalesce(securitysocialnumber,'')) as memberdata
     FROM members ".$where." order by lastname asc,firstname asc;";
     return $this->dbh->queryarray($sql);

diff --git a/public_html/lib/Config.php b/public_html/lib/Config.php
index ab4bfe5..fe1a603 100644 (file)
--- a/public_html/lib/Config.php
+++ b/public_html/lib/Config.php
@@ -16,7 +16,7 @@
   $cfg["db"]["debug"] = 0;
   $cfg["tmppath"] = "data/tmp/";
   $cfg["lang"] = "fr";
-  $cfg["debug"] = 0;
+  $cfg["debug"] = 1;
   $cfg["curlua"] = "NGL-SNEP App";
   $cfg["appname"] = "NGL-SNEP";
   $cfg["env"] = "prod";

diff --git a/public_html/lib/version.php b/public_html/lib/version.php
index c82c61a..cd65d80 100644 (file)
--- a/public_html/lib/version.php
+++ b/public_html/lib/version.php
@@ -1,5 +1,5 @@
 <?php
-$cfg["version"] ="0.10.5";
+$cfg["version"] ="0.10.6";
 if ($cfg["debug"] == "1"){
   $cfg["version"] =date('YmdHis');
 }

diff --git a/public_html/tmpl/js/app/index.min.js b/public_html/tmpl/js/app/index.min.js
index 036fdce..d2cbc99 100644 (file)
--- a/public_html/tmpl/js/app/index.min.js
+++ b/public_html/tmpl/js/app/index.min.js
@@ -1 +1 @@
-let index={tbl:null,tblpayments:null,tblhistory:null,selects:{},init:function(){let richeditfields=["obs"];index.datefields=document.getElementsByClassName("datefield"),flatpickr("#birthday",{altInput:!0,allowInput:!0,altFormat:"d/m/Y",dateFormat:"Y-m-d",onClose:function(selectedDates,dateStr,instance){dataform.savefield(document.getElementById("birthday"),null)}}),flatpickr("#datein",{altInput:!0,allowInput:!0,altFormat:"d/m/Y",dateFormat:"Y-m-d",onClose:function(selectedDates,dateStr,instance){dataform.savefield(document.getElementById("datein"),null)}}),flatpickr("#dateinmut",{altInput:!0,allowInput:!0,altFormat:"d/m/Y",dateFormat:"Y-m-d",onClose:function(selectedDates,dateStr,instance){dataform.savefield(document.getElementById("dateinmut"),null)}}),flatpickr("#dateretired",{altInput:!0,allowInput:!0,altFormat:"d/m/Y",dateFormat:"Y-m-d",onClose:function(selectedDates,dateStr,instance){dataform.savefield(document.getElementById("dateretired"),null)}}),flatpickr("#daterelease",{altInput:!0,allowInput:!0,altFormat:"d/m/Y",dateFormat:"Y-m-d",onClose:function(selectedDates,dateStr,instance){dataform.savefield(document.getElementById("daterelease"),null)}}),flatpickr("#datesepasigned",{altInput:!0,allowInput:!0,altFormat:"d/m/Y",dateFormat:"Y-m-d",onClose:function(selectedDates,dateStr,instance){dataform.savefield(document.getElementById("datesepasigned"),null)}}),flatpickr("#date_transaction",{altInput:!0,allowInput:!0,altFormat:"d/m/Y",dateFormat:"Y-m-d",onClose:function(selectedDates,dateStr,instance){}}),index.selects.memberfilter=new SlimSelect({select:"#memberfilter",settings:{showSearch:!1},events:{afterClose:()=>{let sel;index.tbl.getSelectedData()[0]&&index.gettbldata()}}}),index.selects.birthcountry=new SlimSelect({select:"#birthcountry",settings:{showSearch:!1},events:{afterClose:()=>{let sel;index.tbl.getSelectedData()[0]&&dataform.savefielddata(document.getElementById("birthcountry"),index.selects.birthcountry.getSelected())}}}),index.selects.gender=new SlimSelect({select:"#gender",settings:{showSearch:!1},events:{afterClose:()=>{let sel;index.tbl.getSelectedData()[0]&&dataform.savefielddata(document.getElementById("gender"),index.selects.gender.getSelected())}}}),index.selects.ID_releasetype=new SlimSelect({select:"#ID_releasetype",settings:{showSearch:!1},events:{afterClose:()=>{let sel;index.tbl.getSelectedData()[0]&&dataform.savefielddata(document.getElementById("ID_releasetype"),index.selects.ID_releasetype.getSelected())}}}),index.selects.ID_sector=new SlimSelect({select:"#ID_sector",settings:{showSearch:!1},events:{afterClose:()=>{let sel;index.tbl.getSelectedData()[0]&&dataform.savefielddata(document.getElementById("ID_sector"),index.selects.ID_sector.getSelected())}}}),index.selects.ID_employer=new SlimSelect({select:"#ID_employer",settings:{showSearch:!0},events:{afterClose:()=>{let sel;index.tbl.getSelectedData()[0]&&dataform.savefielddata(document.getElementById("ID_employer"),index.selects.ID_employer.getSelected())},addable:function(value){index.addEmployer(value)}}}),index.selects.ID_section=new SlimSelect({select:"#ID_section",settings:{showSearch:!1},events:{afterClose:()=>{let sel;index.tbl.getSelectedData()[0]&&dataform.savefielddata(document.getElementById("ID_section"),index.selects.ID_section.getSelected())}}}),index.selects.addresscountry=new SlimSelect({select:"#addresscountry",settings:{showSearch:!0},events:{afterClose:()=>{let sel;index.tbl.getSelectedData()[0]&&dataform.savefielddata(document.getElementById("addresscountry"),index.selects.addresscountry.getSelected())}}}),index.selects.ID_quotatype=new SlimSelect({select:"#ID_quotatype",settings:{showSearch:!1},events:{afterClose:()=>{let sel;index.tbl.getSelectedData()[0]&&dataform.savefielddata(document.getElementById("ID_quotatype"),index.selects.ID_quotatype.getSelected())}}}),index.selects.ID_bank=new SlimSelect({select:"#ID_bank",settings:{showSearch:!1},events:{afterClose:()=>{let sel;index.tbl.getSelectedData()[0]&&dataform.savefielddata(document.getElementById("ID_bank"),index.selects.ID_bank.getSelected())}}}),index.selects.ID_sepa_group=new SlimSelect({select:"#ID_sepa_group",settings:{showSearch:!1},events:{afterClose:()=>{let sel;index.tbl.getSelectedData()[0]&&dataform.savefielddata(document.getElementById("ID_sepa_group"),index.selects.ID_sepa_group.getSelected())}}}),index.selects.ID_famillycommon=new SlimSelect({select:"#ID_famillycommon",settings:{showSearch:!1},events:{afterClose:()=>{let sel;index.tbl.getSelectedData()[0]&&dataform.savefielddata(document.getElementById("ID_famillycommon"),index.selects.ID_famillycommon.getSelected())}}}),index.selects.status=new SlimSelect({select:"#status",settings:{showSearch:!1},events:{afterClose:()=>{}}}),index.selects.paymenttype=new SlimSelect({select:"#paymenttype",settings:{showSearch:!1},events:{afterClose:()=>{}}}),index.tbl=new Tabulator("#tbl_members",{columnDefaults:{resizable:!1,headerFilterPlaceholder:"",headerSort:!1,headerFilter:"input",formatter:"html"},height:"calc(100vh - 102px)",layout:"fitDataStretch",selectable:!0,selectableRangeMode:"click",columns:[{title:"#",formatter:"rownum",width:50,headerFilter:null,hozAlign:"right"},{title:"Membre",field:"memberdata",headerSort:!0}]}),index.tbl.on("rowClick",(function(e,row){index.edit()})),index.tbl_member_cotisations=new Tabulator("#tbl_member_cotisations",{columnDefaults:{resizable:!1,headerFilterPlaceholder:"",headerSort:!0,headerFilter:!1,formatter:"html"},rowContextMenu:[{label:'<span class="rowicon icon-edit"></span>éditer',action:function(e,row){return index.editCotisation(),!1}}],height:"calc(100vh - 590px)",layout:"fitData",selectable:1,columns:[{title:"Mois",field:"date_month",formatter:"datetime",formatterParams:{inputFormat:"yyyy-MM-dd",outputFormat:"MM/yyyy",invalidPlaceholder:""}},{title:"Montant",field:"amount",formatter:"money",hozAlign:"right",formatterParams:{decimal:",",thousand:"",symbol:"€",symbolAfter:"p",negativeSign:!0,precision:2}},{title:"Status",field:"status",formatter:tablehelper.statusFormatter},{title:"Type",field:"paymenttype"},{title:"CodeSepa",field:"sepacode"}]}),index.tbl_member_cotisations.on("rowDblClick",(function(e,row){index.editCotisation()})),this.getCountries(),this.getSectors(),this.getQuotaTypes(),this.getSections(),this.getEmployers(),this.getReleaseTypes(),this.getSepaGroups(),this.getBanks(),this.getFamillyCommon()},load:function(){index.gettbldata(),myapp.viewpanel("index")},gettbldata:function(id){let filter=document.getElementById("memberfilter").value,sel=null;index.tbl.getData().length>0&&(sel=index.tbl.getSelectedData(),id&&(sel[0].id=id)),postData({cl:"Members",fn:"getList",type:filter}).then(data=>{index.tbl.setData(data.result.data).then((function(){sel&&sel[0]&&(console.log("select id",sel[0]),index.tbl.selectRow(sel[0].id),index.edit())}))}).catch(e=>{console.log(e)})},gettblCotisation:function(id){let filter=document.getElementById("memberfilter").value,sel=null;index.tbl.getData().length>0&&(sel=index.tbl.getSelectedData()),postData({cl:"Cotisations",fn:"getListByMember",id:sel[0].id}).then(data=>{index.tbl_member_cotisations.setData(data.result.data)}).catch(e=>{console.log(e)})},viewtab:function(tabname){return myapp.viewtab("tab_members",tabname),!1},edit:function(){let sel=null;index.tbl.initialized&&(sel=index.tbl.getSelectedData()),sel[0]&&(postData({cl:"Members",fn:"get",id:sel[0].id}).then(data=>{dataform.fillform("members",this.selects,data.result.data),document.getElementById("con_famillycommon").style.display="block",document.getElementById("con_famillymembers").style.display="none",index.selects.ID_famillycommon.enable(),null!=data.result.data.ID_famillymembers&&(index.selects.ID_famillycommon.disable(),document.getElementById("con_famillycommon").style.display="none",document.getElementById("con_famillymembers").style.display="block")}),index.tbl.scrollToRow(sel[0].id,"top",!1),index.gettblCotisation())},confirmDelete:function(){},delete:function(){},add:function(){postData({cl:"Members",fn:"add"}).then(data=>{index.gettbldata(data.result.data.id)})},addEmployer:function(value){let data;return postData({cl:"Employers",fn:"add",data:{description:value}}).then(data=>{index.getEmployers()}).catch(e=>{console.log("error saving new Employer!"),console.log(e)})},editCotisation:function(){let sel=null;index.tbl_member_cotisations&&(sel=index.tbl_member_cotisations.getSelectedData()),document.getElementById("dlg_cotisation_btnok").setAttribute("onclick","index.saveCotisation();"),sel[0]&&postData({cl:"Cotisations",fn:"getRowData",id:sel[0].id}).then(data=>{dataform.fillform("cotisation",index.selects,data.result.data),myapp.viewdialog("cotisation")})},savePhoto(){let imgsrcid=document.getElementById(""),files=document.getElementById("dlg_uploadfile_files");var reader=new FileReader;reader.onload=function(){var output;document.getElementById(imgsrcid).src=reader.result},reader.readAsDataURL(files.files[0])},saveCotisation(){let datatosave=dataform.getContent("cotisation",index.selects),transferdata={amount:datatosave.amount,paymenttype:datatosave.paymenttype,date_transaction:datatosave.date_transaction,status:datatosave.status};postData({cl:"Cotisations",fn:"saveRow",id:datatosave.id,data:transferdata}).then(data=>{index.gettblCotisation(),document.getElementById("dlg_cotisation").style.display="none"}).catch(e=>{document.getElementById("dlg_cotisation").style.display="none"})},setFamillyCommon:function(){},getCountries:function(){postData({cl:"Countries",fn:"getCountries"}).then(data=>{data.result.data.unshift({iso2:null,country:null}),dataform.fillselectlist(this.selects.birthcountry,data.result.data,"iso2","country"),dataform.fillselectlist(this.selects.addresscountry,data.result.data,"iso2","country")})},getSectors:function(){this.selects.ID_sector&&postData({cl:"Sectors",fn:"getList"}).then(data=>{data.result.data.unshift({id:null,description:null}),dataform.fillselectlist(this.selects.ID_sector,data.result.data,"id","description")})},getQuotaTypes:function(){this.selects.ID_quotatype&&postData({cl:"QuotaTypes",fn:"getList"}).then(data=>{data.result.data.unshift({id:null,description:null}),dataform.fillselectlist(this.selects.ID_quotatype,data.result.data,"id","description")})},getSections:function(){this.selects.ID_section&&postData({cl:"Sections",fn:"getList"}).then(data=>{data.result.data.unshift({id:null,description:null}),dataform.fillselectlist(this.selects.ID_section,data.result.data,"id","description")})},getEmployers:function(){this.selects.ID_employer&&postData({cl:"Employers",fn:"getList"}).then(data=>{data.result.data.unshift({id:null,description:null}),dataform.fillselectlist(this.selects.ID_employer,data.result.data,"id","description")})},getReleaseTypes:function(){this.selects.ID_releasetype&&postData({cl:"ReleasesTypes",fn:"getList"}).then(data=>{data.result.data.unshift({id:null,description:null}),dataform.fillselectlist(this.selects.ID_releasetype,data.result.data,"id","description")})},getSepaGroups:function(){this.selects.ID_sepa_group&&postData({cl:"SepaGroups",fn:"getList"}).then(data=>{data.result.data.unshift({id:null,description:null}),dataform.fillselectlist(this.selects.ID_sepa_group,data.result.data,"id","description")})},getBanks:function(){this.selects.ID_bank&&postData({cl:"Banks",fn:"getList"}).then(data=>{data.result.data.unshift({id:null,description:null}),dataform.fillselectlist(this.selects.ID_bank,data.result.data,"id","description")})},getFamillyCommon:function(){this.selects.ID_famillycommon&&postData({cl:"Members",fn:"getFamillyCommonList"}).then(data=>{data.result.data.unshift({id:null,description:null}),dataform.fillselectlist(this.selects.ID_famillycommon,data.result.data,"id","description")})},next:function(){let srow=index.tbl.getSelectedRows(),nrow=srow[0].getNextRow();nrow&&(srow[0].deselect(),index.tbl.selectRow(nrow._row.data.id),index.edit())},prev:function(){let srow=index.tbl.getSelectedRows(),prow=srow[0].getPrevRow();prow&&(srow[0].deselect(),index.tbl.selectRow(prow._row.data.id),index.edit())}};
\ No newline at end of file
+let index={tbl:null,tblpayments:null,tblhistory:null,selects:{},current_filter:"current",init:function(){let richeditfields=["obs"];index.datefields=document.getElementsByClassName("datefield"),flatpickr("#birthday",{altInput:!0,allowInput:!0,altFormat:"d/m/Y",dateFormat:"Y-m-d",onClose:function(selectedDates,dateStr,instance){dataform.savefield(document.getElementById("birthday"),null)}}),flatpickr("#datein",{altInput:!0,allowInput:!0,altFormat:"d/m/Y",dateFormat:"Y-m-d",onClose:function(selectedDates,dateStr,instance){dataform.savefield(document.getElementById("datein"),null)}}),flatpickr("#dateinmut",{altInput:!0,allowInput:!0,altFormat:"d/m/Y",dateFormat:"Y-m-d",onClose:function(selectedDates,dateStr,instance){dataform.savefield(document.getElementById("dateinmut"),null)}}),flatpickr("#dateretired",{altInput:!0,allowInput:!0,altFormat:"d/m/Y",dateFormat:"Y-m-d",onClose:function(selectedDates,dateStr,instance){dataform.savefield(document.getElementById("dateretired"),null)}}),flatpickr("#daterelease",{altInput:!0,allowInput:!0,altFormat:"d/m/Y",dateFormat:"Y-m-d",onClose:function(selectedDates,dateStr,instance){dataform.savefield(document.getElementById("daterelease"),null)}}),flatpickr("#datesepasigned",{altInput:!0,allowInput:!0,altFormat:"d/m/Y",dateFormat:"Y-m-d",onClose:function(selectedDates,dateStr,instance){dataform.savefield(document.getElementById("datesepasigned"),null)}}),flatpickr("#date_transaction",{altInput:!0,allowInput:!0,altFormat:"d/m/Y",dateFormat:"Y-m-d",onClose:function(selectedDates,dateStr,instance){}}),index.selects.memberfilter=new SlimSelect({select:"#memberfilter",settings:{showSearch:!1},events:{afterClose:()=>{let sel;index.tbl.getSelectedData()[0]&&(console.log("Reload data member"),index.gettbldata())}}}),index.selects.birthcountry=new SlimSelect({select:"#birthcountry",settings:{showSearch:!1},events:{afterClose:()=>{let sel;index.tbl.getSelectedData()[0]&&dataform.savefielddata(document.getElementById("birthcountry"),index.selects.birthcountry.getSelected())}}}),index.selects.gender=new SlimSelect({select:"#gender",settings:{showSearch:!1},events:{afterClose:()=>{let sel;index.tbl.getSelectedData()[0]&&dataform.savefielddata(document.getElementById("gender"),index.selects.gender.getSelected())}}}),index.selects.ID_releasetype=new SlimSelect({select:"#ID_releasetype",settings:{showSearch:!1},events:{afterClose:()=>{let sel;index.tbl.getSelectedData()[0]&&dataform.savefielddata(document.getElementById("ID_releasetype"),index.selects.ID_releasetype.getSelected())}}}),index.selects.ID_sector=new SlimSelect({select:"#ID_sector",settings:{showSearch:!1},events:{afterClose:()=>{let sel;index.tbl.getSelectedData()[0]&&dataform.savefielddata(document.getElementById("ID_sector"),index.selects.ID_sector.getSelected())}}}),index.selects.ID_employer=new SlimSelect({select:"#ID_employer",settings:{showSearch:!0},events:{afterClose:()=>{let sel;index.tbl.getSelectedData()[0]&&dataform.savefielddata(document.getElementById("ID_employer"),index.selects.ID_employer.getSelected())},addable:function(value){index.addEmployer(value)}}}),index.selects.ID_section=new SlimSelect({select:"#ID_section",settings:{showSearch:!1},events:{afterClose:()=>{let sel;index.tbl.getSelectedData()[0]&&dataform.savefielddata(document.getElementById("ID_section"),index.selects.ID_section.getSelected())}}}),index.selects.addresscountry=new SlimSelect({select:"#addresscountry",settings:{showSearch:!0},events:{afterClose:()=>{let sel;index.tbl.getSelectedData()[0]&&dataform.savefielddata(document.getElementById("addresscountry"),index.selects.addresscountry.getSelected())}}}),index.selects.ID_quotatype=new SlimSelect({select:"#ID_quotatype",settings:{showSearch:!1},events:{afterClose:()=>{let sel;index.tbl.getSelectedData()[0]&&dataform.savefielddata(document.getElementById("ID_quotatype"),index.selects.ID_quotatype.getSelected())}}}),index.selects.ID_bank=new SlimSelect({select:"#ID_bank",settings:{showSearch:!1},events:{afterClose:()=>{let sel;index.tbl.getSelectedData()[0]&&dataform.savefielddata(document.getElementById("ID_bank"),index.selects.ID_bank.getSelected())}}}),index.selects.ID_sepa_group=new SlimSelect({select:"#ID_sepa_group",settings:{showSearch:!1},events:{afterClose:()=>{let sel;index.tbl.getSelectedData()[0]&&dataform.savefielddata(document.getElementById("ID_sepa_group"),index.selects.ID_sepa_group.getSelected())}}}),index.selects.ID_famillycommon=new SlimSelect({select:"#ID_famillycommon",settings:{showSearch:!1},events:{afterClose:()=>{let sel;index.tbl.getSelectedData()[0]&&dataform.savefielddata(document.getElementById("ID_famillycommon"),index.selects.ID_famillycommon.getSelected())}}}),index.selects.status=new SlimSelect({select:"#status",settings:{showSearch:!1},events:{afterClose:()=>{}}}),index.selects.paymenttype=new SlimSelect({select:"#paymenttype",settings:{showSearch:!1},events:{afterClose:()=>{}}}),index.tbl=new Tabulator("#tbl_members",{columnDefaults:{resizable:!1,headerFilterPlaceholder:"",headerSort:!1,headerFilter:"input",formatter:"html"},height:"calc(100vh - 102px)",layout:"fitDataStretch",selectable:!0,selectableRangeMode:"click",columns:[{title:"#",formatter:"rownum",width:50,headerFilter:null,hozAlign:"right"},{title:"Membre",field:"memberdata",headerSort:!0}]}),index.tbl.on("rowClick",(function(e,row){index.edit()})),index.tbl_member_cotisations=new Tabulator("#tbl_member_cotisations",{columnDefaults:{resizable:!1,headerFilterPlaceholder:"",headerSort:!0,headerFilter:!1,formatter:"html"},rowContextMenu:[{label:'<span class="rowicon icon-edit"></span>éditer',action:function(e,row){return index.editCotisation(),!1}}],height:"calc(100vh - 590px)",layout:"fitData",selectable:1,columns:[{title:"Mois",field:"date_month",formatter:"datetime",formatterParams:{inputFormat:"yyyy-MM-dd",outputFormat:"MM/yyyy",invalidPlaceholder:""}},{title:"Montant",field:"amount",formatter:"money",hozAlign:"right",formatterParams:{decimal:",",thousand:"",symbol:"€",symbolAfter:"p",negativeSign:!0,precision:2}},{title:"Status",field:"status",formatter:tablehelper.statusFormatter},{title:"Type",field:"paymenttype"},{title:"CodeSepa",field:"sepacode"}]}),index.tbl_member_cotisations.on("rowDblClick",(function(e,row){index.editCotisation()})),this.getCountries(),this.getSectors(),this.getQuotaTypes(),this.getSections(),this.getEmployers(),this.getReleaseTypes(),this.getSepaGroups(),this.getBanks(),this.getFamillyCommon()},load:function(){index.gettbldata(),myapp.viewpanel("index")},gettbldata:function(id){let filter=document.getElementById("memberfilter").value,sel=null;index.tbl.getData().length>0&&(sel=index.tbl.getSelectedData(),id&&(sel[0].id=id)),console.log("filter",filter),postData({cl:"Members",fn:"getList",type:filter}).then(data=>{index.tbl.setData(data.result.data).then((function(){if(sel&&sel[0]){console.log("select id",sel[0]);try{index.tbl.selectRow(sel[0].id),index.edit()}catch(e){console.log("Error selection ",sel[0])}}})).catch(e=>{console.log("selection failed!")})}).catch(e=>{console.log(e)})},gettblCotisation:function(id){let filter=document.getElementById("memberfilter").value,sel=null;index.tbl.getData().length>0&&(sel=index.tbl.getSelectedData()),postData({cl:"Cotisations",fn:"getListByMember",id:sel[0].id}).then(data=>{index.tbl_member_cotisations.setData(data.result.data)}).catch(e=>{console.log(e)})},viewtab:function(tabname){return myapp.viewtab("tab_members",tabname),!1},edit:function(){let sel=null;index.tbl.initialized&&(sel=index.tbl.getSelectedData()),sel[0]&&(postData({cl:"Members",fn:"get",id:sel[0].id}).then(data=>{dataform.fillform("members",this.selects,data.result.data),document.getElementById("con_famillycommon").style.display="block",document.getElementById("con_famillymembers").style.display="none",index.selects.ID_famillycommon.enable(),null!=data.result.data.ID_famillymembers&&(index.selects.ID_famillycommon.disable(),document.getElementById("con_famillycommon").style.display="none",document.getElementById("con_famillymembers").style.display="block")}),index.tbl.scrollToRow(sel[0].id,"top",!1),index.gettblCotisation())},confirmDelete:function(){},delete:function(){},add:function(){postData({cl:"Members",fn:"add"}).then(data=>{index.gettbldata(data.result.data.id)})},addEmployer:function(value){let data;return postData({cl:"Employers",fn:"add",data:{description:value}}).then(data=>{index.getEmployers()}).catch(e=>{console.log("error saving new Employer!"),console.log(e)})},editCotisation:function(){let sel=null;index.tbl_member_cotisations&&(sel=index.tbl_member_cotisations.getSelectedData()),document.getElementById("dlg_cotisation_btnok").setAttribute("onclick","index.saveCotisation();"),sel[0]&&postData({cl:"Cotisations",fn:"getRowData",id:sel[0].id}).then(data=>{dataform.fillform("cotisation",index.selects,data.result.data),myapp.viewdialog("cotisation")})},savePhoto(){let imgsrcid=document.getElementById(""),files=document.getElementById("dlg_uploadfile_files");var reader=new FileReader;reader.onload=function(){var output;document.getElementById(imgsrcid).src=reader.result},reader.readAsDataURL(files.files[0])},saveCotisation(){let datatosave=dataform.getContent("cotisation",index.selects),transferdata={amount:datatosave.amount,paymenttype:datatosave.paymenttype,date_transaction:datatosave.date_transaction,status:datatosave.status};postData({cl:"Cotisations",fn:"saveRow",id:datatosave.id,data:transferdata}).then(data=>{index.gettblCotisation(),document.getElementById("dlg_cotisation").style.display="none"}).catch(e=>{document.getElementById("dlg_cotisation").style.display="none"})},setFamillyCommon:function(){},getCountries:function(){postData({cl:"Countries",fn:"getCountries"}).then(data=>{data.result.data.unshift({iso2:null,country:null}),dataform.fillselectlist(this.selects.birthcountry,data.result.data,"iso2","country"),dataform.fillselectlist(this.selects.addresscountry,data.result.data,"iso2","country")})},getSectors:function(){this.selects.ID_sector&&postData({cl:"Sectors",fn:"getList"}).then(data=>{data.result.data.unshift({id:null,description:null}),dataform.fillselectlist(this.selects.ID_sector,data.result.data,"id","description")})},getQuotaTypes:function(){this.selects.ID_quotatype&&postData({cl:"QuotaTypes",fn:"getList"}).then(data=>{data.result.data.unshift({id:null,description:null}),dataform.fillselectlist(this.selects.ID_quotatype,data.result.data,"id","description")})},getSections:function(){this.selects.ID_section&&postData({cl:"Sections",fn:"getList"}).then(data=>{data.result.data.unshift({id:null,description:null}),dataform.fillselectlist(this.selects.ID_section,data.result.data,"id","description")})},getEmployers:function(){this.selects.ID_employer&&postData({cl:"Employers",fn:"getList"}).then(data=>{data.result.data.unshift({id:null,description:null}),dataform.fillselectlist(this.selects.ID_employer,data.result.data,"id","description")})},getReleaseTypes:function(){this.selects.ID_releasetype&&postData({cl:"ReleasesTypes",fn:"getList"}).then(data=>{data.result.data.unshift({id:null,description:null}),dataform.fillselectlist(this.selects.ID_releasetype,data.result.data,"id","description")})},getSepaGroups:function(){this.selects.ID_sepa_group&&postData({cl:"SepaGroups",fn:"getList"}).then(data=>{data.result.data.unshift({id:null,description:null}),dataform.fillselectlist(this.selects.ID_sepa_group,data.result.data,"id","description")})},getBanks:function(){this.selects.ID_bank&&postData({cl:"Banks",fn:"getList"}).then(data=>{data.result.data.unshift({id:null,description:null}),dataform.fillselectlist(this.selects.ID_bank,data.result.data,"id","description")})},getFamillyCommon:function(){this.selects.ID_famillycommon&&postData({cl:"Members",fn:"getFamillyCommonList"}).then(data=>{data.result.data.unshift({id:null,description:null}),dataform.fillselectlist(this.selects.ID_famillycommon,data.result.data,"id","description")})},next:function(){let srow=index.tbl.getSelectedRows(),nrow=srow[0].getNextRow();nrow&&(srow[0].deselect(),index.tbl.selectRow(nrow._row.data.id),index.edit())},prev:function(){let srow=index.tbl.getSelectedRows(),prow=srow[0].getPrevRow();prow&&(srow[0].deselect(),index.tbl.selectRow(prow._row.data.id),index.edit())}};
\ No newline at end of file

diff --git a/public_html/tmpl/js/app/invoicing.js b/public_html/tmpl/js/app/invoicing.js
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/public_html/tmpl/js/pages/index.js b/public_html/tmpl/js/pages/index.js
index f1773ba..e95aa7c 100644 (file)
--- a/public_html/tmpl/js/pages/index.js
+++ b/public_html/tmpl/js/pages/index.js
@@ -4,6 +4,7 @@ let index = {
   tblpayments: null,
   tblhistory: null,
   selects: {},
+  current_filter: "current",
   init: function(){
     let richeditfields = ["obs"];
     
@@ -73,6 +74,7 @@ let index = {
           afterClose: () =>{
             let sel = index.tbl.getSelectedData();
             if (sel[0]){
+              console.log("Reload data member");
               index.gettbldata();
             }
           }
@@ -308,20 +310,28 @@ let index = {
   gettbldata: function(id){
     let filter=document.getElementById("memberfilter").value;
     let sel = null;
-    if (index.tbl.getData().length > 0){
+    if (index.tbl.getData().length > 0 ){
       sel= index.tbl.getSelectedData();
       if (id){
         sel[0].id = id;
       }
     }
+    console.log("filter",filter);
     postData({"cl":"Members","fn":"getList","type":filter}).then(data => {
       index.tbl.setData(data.result.data).then(function(){
-        if(sel && sel[0]){
+        
+        if(sel && sel[0] ){
           console.log("select id",sel[0]);
-          index.tbl.selectRow(sel[0]['id']);
-          index.edit();
+
+          try {
+            index.tbl.selectRow(sel[0]['id']);
+            index.edit();
+          } catch (e){
+            console.log('Error selection ', sel[0] );
+          }
+          
         }
-      });
+      }).catch(e => { console.log("selection failed!"); });
     }).catch(e => { console.log(e)});
   },
   gettblCotisation: function(id){