From: Kilian Saffran Date: Mon, 26 Mar 2018 06:33:43 +0000 (+0200) Subject: remove backup and free version X-Git-Tag: 3.18.2_beta0^0 X-Git-Url: http://cloud.dks.lu/git/?a=commitdiff_plain;h=c6c2c25cf10c9ca0b55b37d7a5a8eb14f21f1db7;p=creorga.git remove backup and free version --- diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index dbf848f..340c084 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -4,5 +4,7 @@ encoding//app/modules/calendar/calglobal.html=UTF-8 encoding//app/modules/calendar/calvacancy.html=UTF-8 encoding//app/modules/info/settings.html=UTF-8 encoding//app_v3/Tools/pdfextract.pl=UTF-8 +encoding//app_v3/chrome/content/modules/accounting/accounting.xul=UTF-8 +encoding//app_v3/chrome/content/modules/support/support.xul=UTF-8 encoding//db/data.sqlite.calimero_diff.sql=UTF-8 encoding/License.txt=UTF-8 diff --git a/Tools/pdfextract.pl b/Tools/pdfextract.pl index ff4abd3..f301956 100644 --- a/Tools/pdfextract.pl +++ b/Tools/pdfextract.pl @@ -20,7 +20,7 @@ my $log =""; my $db = undef; my $cmonth = "none"; my $frmonth = {"Janvier" => '01',"Février"=> '02',"Mars" => '03',"Avril" => '04', "Mai" => '05',"Juin" => '06',"Juillet" => '07',"Août" => '08',"Septembre" => '09',"Octobre" => '10',"Novembre" => '11',"Décembre" => '12'}; -#-db "C:\\Users\\ksaff\\DKS\\projects\\Creorga\\DevCreches\\f4ebb982-498b-11e4-96ae-4302fce0f26a.sqlite" -p "C:\\Users\\ksaff\\DKS\\projects\\Creorga\\Calimero\\facture\\Diff_Factures2017_10.pdf" -t "C:\\Users\\ksaff\\Workspace\\creorga\\Tools" -x inv -l "C:\\Users\\ksaff\\DKS\\projects\\Creorga\\pdfextract.log" +#-db "C:\\Users\\ksaff\\DKS\\projects\\Creorga\\Calimero\\20170302\\diff\\5531423c-b85a-4305-9372-c62a293d0c84.sqlite" -p "C:\\Users\\ksaff\\DKS\\projects\\Creorga\\Calimero\\facture\\factures201712 (1).pdf" -t "C:\\Users\\ksaff\\Workspace\\creorga\\Tools" -x inv -l "C:\\Users\\ksaff\\DKS\\projects\\Creorga\\pdfextract.log" -o "C:\\Users\\ksaff\\DKS\\projects\\Creorga\\Calimero\\20170302\\diff\\imports\\5531423c-b85a-4305-9372-c62a293d0c84" GetOptions("dbfile|db=s" => \$dbfile, "pdf|p=s" => \$pdffile, "outdir|o=s" => \$outputdir, @@ -144,15 +144,16 @@ if ($totext == 1) { close(PDFDATA); if (lc($template) eq "inv") { my $childdata = &parseinvoicedata(\@pdata); - #print Dumper($childdata); + print Dumper($childdata); print "Import des donnees Check-Service No.: ".$childdata->{checkservice}."\n"; + print "\n----\n"; &importinvoicedata($childdata,$n); }elsif (lc($template eq "stmt")){ my $stmtdata = &parsestatementdata(\@pdata); print "Import des données Page: ".basename($n)."\n"; &importstatementdata($stmtdata,$n); } - unlink("$n.txt"); + #unlink("$n.txt"); } } } @@ -162,26 +163,36 @@ sub parseinvoicedata(){ my @invoicedata = @{$tmpdata}; my $pxdata = (); foreach my $p (@invoicedata){ - if ($p =~ /^N. Facture/) { + if (($p =~ /^N. Facture/) || ($p =~ /^No da Fatura/) || ($p =~ /^Rechnungsnr./) || ($p =~ /N. Rechnung/)){ my ($tmp) = $p =~ m/.+\s(\d{4,}.\d{1,2}.\d{4,})\s.+$/; $pxdata->{reference} = $tmp; } - if ($p =~ /^Date de la facture/) { + if (($p =~ /^Date de la facture/) || ($p =~ /^Data da Fatura/) || ($p =~ /^Datum vun der Rechnung/)) { my ($d,$m,$y) = $p =~ m/.+\s(\d{1,2}).(\d{1,2}).(\d{4,}).+$/; if (length($d) == 1) { $d = "0".$d;} if (length($m) == 1) { $m = "0".$m;} $pxdata->{invoicedate} = $y.'-'.$m.'-'.$d; } + if ($p =~ /^Datum\s+/){ + my ($d,$m,$y) = $p =~ m/.+\s(\d{1,2}).(\d{1,2}).(\d{4,}).+$/; + if (length($d) == 1) { $d = "0".$d;} + if (length($m) == 1) { $m = "0".$m;} + $pxdata->{invoicedate} = $y.'-'.$m.'-'.$d; + } # if (($p =~ /facture/) && ($pxdata->{invoicedate} eq "--")) { # my ($d,$m,$y) = $p =~ m/.+\s(\d{1,2}).(\d{1,2}).(\d{4,})$/; # if (length($d) == 1) { $d = "0".$d;} # if (length($m) == 1) { $m = "0".$m;} # $pxdata->{invoicedate} = $y.'-'.$m.'-'.$d; # } - if ($p =~ /^Enfant/) { + if (($p =~ /^Enfant/) || ($p =~ /^Crian.a/) || ($p =~ /^Kind/) || ($p =~ /^Kand/)) { my ($tmp) = $p =~ m/.+\s\((\d+)\).+$/; $pxdata->{checkservice} = $tmp; } + if (($p =~ /\s+\(\d+\)\s*$/)) { + my ($tmp) = $p =~ m/\s+\((\d+)\s*\)$/; + $pxdata->{checkservice} = $tmp; + } if (($p =~ /^\s+\(\d+\)$/) && (!defined($pxdata->{checkservice}))) { my ($tmp) = $p =~ m/\s+\((\d+)\)$/; $pxdata->{checkservice} = $tmp; @@ -199,7 +210,46 @@ sub parseinvoicedata(){ } } - if ($p =~ /Repas/) { + if ($p =~ /Horas.+\sh\s/) { + my ($hrs,$p1,$e1) = $p =~ m/.+Horas.+\s+([\s|\d]+,\d{1,2})\sh\s+([\s|\d]+,\d{1,2})\s+([\s|\d]+,\d{1,2}).+$/; + $p1 =~ s/,/\./; + $e1 =~ s/,/\./; + $p1 =~ s/\ //; + $e1 =~ s/\ //; + if (exists($pxdata->{hoursamount})){ + $pxdata->{hoursamount} = $pxdata->{hoursamount} + $p1 + $e1; + } else { + $pxdata->{hoursamount} = $p1 + $e1; + } + + } + if ($p =~ /Stunden.+\sSt.\s/) { + my ($hrs,$p1,$e1) = $p =~ m/.+Stunden.+\s+([\s|\d]+,\d{1,2})\sh\s+([\s|\d]+,\d{1,2})\s+([\s|\d]+,\d{1,2}).+$/; + $p1 =~ s/,/\./; + $e1 =~ s/,/\./; + $p1 =~ s/\ //; + $e1 =~ s/\ //; + if (exists($pxdata->{hoursamount})){ + $pxdata->{hoursamount} = $pxdata->{hoursamount} + $p1 + $e1; + } else { + $pxdata->{hoursamount} = $p1 + $e1; + } + + } + if ($p =~ /Stonnen.+\sSt.\s/) { + my ($hrs,$p1,$e1) = $p =~ m/.+Stonnen.+\s+([\s|\d]+,\d{1,2})\sh\s+([\s|\d]+,\d{1,2})\s+([\s|\d]+,\d{1,2}).+$/; + $p1 =~ s/,/\./; + $e1 =~ s/,/\./; + $p1 =~ s/\ //; + $e1 =~ s/\ //; + if (exists($pxdata->{hoursamount})){ + $pxdata->{hoursamount} = $pxdata->{hoursamount} + $p1 + $e1; + } else { + $pxdata->{hoursamount} = $p1 + $e1; + } + + } + if (($p =~ /.+Repas/) ){ my ($rn,$p1,$e1) = $p =~ m/.+Repas.+\s+(\d+)\s+([\s|\d]+,\d{1,2})\s+([\s|\d]+,\d{1,2}).+$/; $p1 =~ s/,/\./; $e1 =~ s/,/\./; @@ -208,18 +258,75 @@ sub parseinvoicedata(){ $pxdata->{lunchnum} = $rn; $pxdata->{lunchamount} = $p1 + $e1; } + if (($p =~ /\s+Refei..o/) ){ + my ($rn,$p1,$e1) = $p =~ m/.+Refei..o\s+(\d+)\s+([\s|\d]+,\d{1,2})\s+([\s|\d]+,\d{1,2}).+$/; + $p1 =~ s/,/\./; + $e1 =~ s/,/\./; + $p1 =~ s/\ //; + $e1 =~ s/\ //; + $pxdata->{lunchnum} = $rn; + $pxdata->{lunchamount} = $p1 + $e1; + } + if (($p =~ /\s+Mahlzeiten/) ){ + my ($rn,$p1,$e1) = $p =~ m/.+Mahlzeiten\s+(\d+)\s+([\s|\d]+,\d{1,2})\s+([\s|\d]+,\d{1,2}).+$/; + $p1 =~ s/,/\./; + $e1 =~ s/,/\./; + $p1 =~ s/\ //; + $e1 =~ s/\ //; + $pxdata->{lunchnum} = $rn; + $pxdata->{lunchamount} = $p1 + $e1; + } + if (($p =~ /\s+Moolzecht/) ){ + my ($rn,$p1,$e1) = $p =~ m/.+Moolzecht\s+(\d+)\s+([\s|\d]+,\d{1,2})\s+([\s|\d]+,\d{1,2}).+$/; + $p1 =~ s/,/\./; + $e1 =~ s/,/\./; + $p1 =~ s/\ //; + $e1 =~ s/\ //; + $pxdata->{lunchnum} = $rn; + $pxdata->{lunchamount} = $p1 + $e1; + } if ($p =~ /Participation totale de l.Etat/){ my ($e1) = $p =~ m/.+Participation totale de l.Etat\s+([\s|\d]+,\d{1,2}).+$/; $e1 =~ s/,/\./; $e1 =~ s/\ //; $pxdata->{benefitamount} = $e1; } - if ($p =~ /Montant\s.\sr.gler/) { + if ($p =~ /Participa..o total do Estado/){ + my ($e1) = $p =~ m/.+Participa..o total do Estado\s+([\s|\d]+,\d{1,2}).+$/; + $e1 =~ s/,/\./; + $e1 =~ s/\ //; + $pxdata->{benefitamount} = $e1; + } + if ($p =~ /Gesamtbeitrag des Staates/){ + my ($e1) = $p =~ m/.+Gesamtbeitrag des Staates\s+([\s|\d]+,\d{1,2}).+$/; + $e1 =~ s/,/\./; + $e1 =~ s/\ //; + $pxdata->{benefitamount} = $e1; + } + if ($p =~ /Total Bedeelegung vum Staat/){ + my ($e1) = $p =~ m/.+Total Bedeelegung vum Staat\s+([\s|\d]+,\d{1,2}).+$/; + $e1 =~ s/,/\./; + $e1 =~ s/\ //; + $pxdata->{benefitamount} = $e1; + } + if (($p =~ /Montant\s.\sr.gler/) || ($p =~ /Montante a pagar/)) { my ($m1) = $p =~ m/.+Montant.+\s+([\s|\d]+,\d{1,2}).+$/; $m1 =~ s/,/\./; $m1 =~ s/\ //; $pxdata->{totalamount} = $m1; } + if (($p =~ /\s+Rechnungsbetrag/)) { + my ($m1) = $p =~ m/\s+Rechnungsbetrag\s+([\s|\d]+,\d{1,2}).+$/; + $m1 =~ s/,/\./; + $m1 =~ s/\ //; + $pxdata->{totalamount} = $m1; + } + if (($p =~ /\s+Ze bezuelen/)) { + my ($m1) = $p =~ m/\s+Ze bezuelen\s+([\s|\d]+,\d{1,2}).+$/; + $m1 =~ s/,/\./; + $m1 =~ s/\ //; + $pxdata->{totalamount} = $m1; + } #print Dumper(@pdata); } return $pxdata; diff --git a/app_v3/chrome.manifest_basic b/app_v3/chrome.manifest_basic index 36f0135..c33db3e 100644 --- a/app_v3/chrome.manifest_basic +++ b/app_v3/chrome.manifest_basic @@ -4,7 +4,7 @@ overlay chrome://creorga/content/creorga.xul chrome://creorga/content/modules/pr overlay chrome://creorga/content/creorga.xul chrome://creorga/content/modules/multisite/multisite.xul overlay chrome://creorga/content/creorga.xul chrome://creorga/content/modules/staff/staff_basic.xul overlay chrome://creorga/content/creorga.xul chrome://creorga/content/modules/forms/forms_basic.xul -overlay chrome://creorga/content/creorga.xul chrome://creorga/content/modules/support/support_basic.xul +overlay chrome://creorga/content/creorga.xul chrome://creorga/content/modules/support/support.xul overlay chrome://creorga/content/creorga.xul chrome://creorga/content/modules/reports/reports.xul overlay chrome://creorga/content/creorga.xul chrome://creorga/content/modules/calendar/calendar_basic.xul overlay chrome://creorga/content/creorga.xul chrome://creorga/content/modules/logbook/logbook_basic.xul diff --git a/app_v3/chrome.manifest_free b/app_v3/chrome.manifest_free deleted file mode 100644 index 331659e..0000000 --- a/app_v3/chrome.manifest_free +++ /dev/null @@ -1,11 +0,0 @@ -content creorga chrome/content/ -locale branding fr-FR chrome/branding/locale/ -overlay chrome://creorga/content/creorga.xul chrome://creorga/content/modules/default_free/default_free.xul -overlay chrome://creorga/content/creorga.xul chrome://creorga/content/modules/presences/presences.xul -overlay chrome://creorga/content/creorga.xul chrome://creorga/content/modules/accounting/accounting_free.xul -overlay chrome://creorga/content/creorga.xul chrome://creorga/content/modules/staff/staff.xul -overlay chrome://creorga/content/creorga.xul chrome://creorga/content/modules/forms/forms.xul -overlay chrome://creorga/content/creorga.xul chrome://creorga/content/modules/support/support_free.xul -overlay chrome://creorga/content/creorga.xul chrome://creorga/content/modules/reports/reports.xul -overlay chrome://creorga/content/creorga.xul chrome://creorga/content/modules/calendar/calendar_free.xul -overlay chrome://creorga/content/creorga.xul chrome://creorga/content/modules/logbook/logbook_free.xul diff --git a/app_v3/chrome.manifest_localmanager b/app_v3/chrome.manifest_localmanager index 6cf4224..2696733 100644 --- a/app_v3/chrome.manifest_localmanager +++ b/app_v3/chrome.manifest_localmanager @@ -4,7 +4,7 @@ overlay chrome://creorga/content/creorga.xul chrome://creorga/content/modules/pr overlay chrome://creorga/content/creorga.xul chrome://creorga/content/modules/multisite/multisite.xul overlay chrome://creorga/content/creorga.xul chrome://creorga/content/modules/staff/staff.xul overlay chrome://creorga/content/creorga.xul chrome://creorga/content/modules/forms/forms_basic.xul -overlay chrome://creorga/content/creorga.xul chrome://creorga/content/modules/support/support_basic.xul +overlay chrome://creorga/content/creorga.xul chrome://creorga/content/modules/support/support.xul overlay chrome://creorga/content/creorga.xul chrome://creorga/content/modules/reports/reports.xul overlay chrome://creorga/content/creorga.xul chrome://creorga/content/modules/calendar/calendar.xul overlay chrome://creorga/content/creorga.xul chrome://creorga/content/modules/logbook/logbook_basic.xul diff --git a/app_v3/chrome/content/creorga_free.xul b/app_v3/chrome/content/creorga_free.xul deleted file mode 100644 index df9974d..0000000 --- a/app_v3/chrome/content/creorga_free.xul +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app_v3/chrome/content/modules/default_free/default_free.xul b/app_v3/chrome/content/modules/default_free/default_free.xul deleted file mode 100644 index 0488464..0000000 --- a/app_v3/chrome/content/modules/default_free/default_free.xul +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app_v3/chrome/content/modules/logbook/logactivity_free.html b/app_v3/chrome/content/modules/logbook/logactivity_free.html deleted file mode 100644 index 7e0f5f6..0000000 --- a/app_v3/chrome/content/modules/logbook/logactivity_free.html +++ /dev/null @@ -1,165 +0,0 @@ - - - - - - Livret des activités - - - - - - - - - - - - - - - - - - - - -
-
-
- du mois: - - -
- - - - -
-
- - - - - - - -
-
- - - -
- - -
Titre:
-
Date: au
- -
-
- - - -
- - - - - - - - - - - - - - - - - - - - - diff --git a/app_v3/chrome/content/modules/logbook/logbook_free.xul b/app_v3/chrome/content/modules/logbook/logbook_free.xul deleted file mode 100644 index 3d89b3d..0000000 --- a/app_v3/chrome/content/modules/logbook/logbook_free.xul +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app_v3/chrome/content/modules/logbook/logchild_free.html b/app_v3/chrome/content/modules/logbook/logchild_free.html deleted file mode 100644 index f0f2243..0000000 --- a/app_v3/chrome/content/modules/logbook/logchild_free.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - Livret d'évaluation des enfants - - - - - - - - - - - - - - - - - - - -
-
-
- date du: - - -
- - - -
-
- - - - - - - -
- -
- - - -
-
-
- -
- - -
- - - - - - - - - - - - - - - - - - - - - diff --git a/app_v3/chrome/content/modules/logbook/logcominterne_free.html b/app_v3/chrome/content/modules/logbook/logcominterne_free.html deleted file mode 100644 index 19e2847..0000000 --- a/app_v3/chrome/content/modules/logbook/logcominterne_free.html +++ /dev/null @@ -1,165 +0,0 @@ - - - - - - Communication interne - - - - - - - - - - - - - - - - - - - - -
-
-
- du mois: - - -
- - - - -
-
- - - - - - - -
-
- - - -
- -
Titre:
-
Date:
- -
- -
-
- - - -
- - - - - - - - - - - - - - - - - - - - - diff --git a/app_v3/chrome/content/modules/staff/coworker_free.html b/app_v3/chrome/content/modules/staff/coworker_free.html deleted file mode 100644 index f8bd0d2..0000000 --- a/app_v3/chrome/content/modules/staff/coworker_free.html +++ /dev/null @@ -1,651 +0,0 @@ - - - - - - - Employé(e) - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - - - - -
-
-
- - - -
- -
- -
- -
- - - -
- -
- -
-
- - - -
-
- - 		-
-
- -
- -
- -
- -
-
- -
- -
- - -
- -
- - -
h
-
-
- -
- -
-
-
- -
- - -
- -
-
-
- - -
- -
-
- -
- -
- -
- - -
-
-
-
- -
- -
- -
- - -
- - h -
- -
-
- - -
- - h -
- -
-
- - - - - -
- - -
- 		- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Congé
  planification 
Typeouvertdemandévalidépris
normale    
exceptionelle    
maladie    
total    
-
- -
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app_v3/chrome/content/modules/support/backup.html b/app_v3/chrome/content/modules/support/backup.html deleted file mode 100644 index ea7e186..0000000 --- a/app_v3/chrome/content/modules/support/backup.html +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - Creorga - Backup - - - - - - - - - - - - - - - - - - -
-
- - - - - -
- - -
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app_v3/chrome/content/modules/support/js/backup.js b/app_v3/chrome/content/modules/support/js/backup.js deleted file mode 100644 index 5906e60..0000000 --- a/app_v3/chrome/content/modules/support/js/backup.js +++ /dev/null @@ -1,79 +0,0 @@ -//Source-code licensed under EUPL v1.1 ( Copyright 2016 By DKS s.à r.l. - Kilian Saffran - Luxembourg ) - -var cfile = null; -var wh= window.screen.height -400; -//var curcfg = null; - -function initdata(){ - set_infoheader(""); - curcfg.loadconfig(apppref.getpreference("support.database.currentdb.num")); - load_backup_table(); -} - -function load_backup_table() { - var files = system.getBackups(); - $("#tbl_backup").html(""); - $("#tbl_backup").append("restaurerdate du backup"); - var tbody = ""; - var bdata = new Array(); - for (var f in files){ - bdata.push(files[f].path); - } - bdata = bdata.reverse(); - for (var i=0;i'; - tbody += ''; - - tbody += ""; - tbody += "" + cdate.toLocaleFormat("%d.%m.%Y") + ""; - tbody += ""; - } - } - tbody += ""; - $("#tbl_backup").append(tbody); - - var btbl = $("#tbl_backup").dataTable({ - "language": { - "url": "js/locale/datatable_fr.json" - }, - "paging": false, - "ordering": false, - "scrollY": wh + "px", - "scrollCollapse": true, - "info": false, - "filter": false, - "destroy": true - }); -} - -function backup_restore(fname){ - cfile = system.profiledir() + system.sep() + 'backup' + system.sep() + fname; - $("#confirm_restore_data").modal('show'); -} - -function restore_data(){ - tools.restoredata(cfile); - $("#confirm_restore_data").modal('hide'); -} - -//function create_backup(){ -// tools.backup(); -// load_backup_table(); -//} - -function import_data() { - tools.importdata(); - -} - -function export_data() { - tools.exportdata(); -} \ No newline at end of file diff --git a/app_v3/chrome/content/modules/support/multisite.html b/app_v3/chrome/content/modules/support/multisite.html index 3ce71d7..cf70271 100644 --- a/app_v3/chrome/content/modules/support/multisite.html +++ b/app_v3/chrome/content/modules/support/multisite.html @@ -28,7 +28,7 @@ - + - - - - - - - - - - -
- -
- - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app_v3/chrome/content/modules/support/support.xul b/app_v3/chrome/content/modules/support/support.xul index 48a88e2..9e3a3ec 100644 --- a/app_v3/chrome/content/modules/support/support.xul +++ b/app_v3/chrome/content/modules/support/support.xul @@ -4,8 +4,7 @@ - - + diff --git a/app_v3/chrome/content/modules/support/support_basic.xul b/app_v3/chrome/content/modules/support/support_basic.xul deleted file mode 100644 index 381c018..0000000 --- a/app_v3/chrome/content/modules/support/support_basic.xul +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app_v3/chrome/content/modules/support/support_free.xul b/app_v3/chrome/content/modules/support/support_free.xul deleted file mode 100644 index 2bf1152..0000000 --- a/app_v3/chrome/content/modules/support/support_free.xul +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file