PDFExtract corrections and child plaification INSERT error

diff --git a/Tools/pdfextract.pl b/Tools/pdfextract.pl
index e33c316..a59838e 100644 (file)
--- a/Tools/pdfextract.pl
+++ b/Tools/pdfextract.pl
@@ -150,7 +150,7 @@ if ($xmlfile ne "" && -e $xmlfile){
 #              $xmlres->{$ref}->{checkservice} = $nx;
        }
 }
-print Dumper($xmlres);
+#print Dumper($xmlres);
 my $allchilddata = ();
 if ($totext == 1) {
   foreach my $n (@nfiles){
@@ -173,7 +173,6 @@ if ($totext == 1) {
       close(PDFDATA);
      # if (lc($template) eq "inv") {
        my $childdata = &parseinvoicedata(\@pdata);
-        #print Dumper($childdata);
         print "Import des donnees Check-Service No.: ".$childdata->{checkservice}."\n";
         if (exists($xmlres->{$childdata->{reference}})){
                $childdata->{checkservice} = $xmlres->{$childdata->{reference}}->{checkservice};
@@ -185,9 +184,12 @@ if ($totext == 1) {
         }
         print "\n----\n";
         my ($impfile,$sqlres) = &importinvoicedata($childdata,$n);
-      #}
-      $childdata->{newpdffile} =  $impfile;
+        $childdata->{newpdffile} =  $impfile;
       $childdata->{sqlresult} =  $sqlres;
+        print "\n=====\n";
+      #}
+      
+      #print Dumper($childdata);
 #      elsif (lc($template eq "stmt")){
 #        my $stmtdata = &parsestatementdata(\@pdata);
 #        print "Import des données Page: ".basename($n)."\n";
@@ -195,7 +197,7 @@ if ($totext == 1) {
 #      }
          #print Dumper($childdata);
           #print "\n==================\n";
-      #unlink("$n.txt");
+      unlink("$n.txt");
       $allchilddata->{$childdata->{reference}} = $childdata;
     }
   }
@@ -258,8 +260,8 @@ sub parseinvoicedata(){
           my ($tmp) = $p =~ m/.+\s\((\d+)\).+$/;
           $pxdata->{checkservice} = $tmp;
         }
-        if (($p =~ /\s+\(\d+\)\s*$/)&& (!defined($pxdata->{checkservice}))) {
-          my ($tmp) = $p =~ m/\s+\((\d+)\s*\)$/;
+        if (($p =~ /\s+\(\d+\)\s.*$/)&& (!defined($pxdata->{checkservice}))) {
+          my ($tmp) = $p =~ m/\s+\((\d+)\)\s.*$/;
           $pxdata->{checkservice} = $tmp;
         }
         if (($p =~ /\s+\(\d+\).+$/)&& (!defined($pxdata->{checkservice}))) {
@@ -324,7 +326,7 @@ sub parseinvoicedata(){
         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}).+$/;
           if (!defined($hrs)){
-               ($hrs,$p1) = $p =~ m/.+Heures.+\s+([\s|\d]+,\d{1,2})\sh\s+([\s|\d]+,\d{1,2}).+$/;
+               ($hrs,$p1) = $p =~ m/.+Heures.+\s+([\s|\d]+\,\d{1,2})\sh\s+([\s|\d]+\,\d{1,2}).+$/;
                $e1 = "0,0";
           }
           $p1 =~ s/,/\./;
@@ -339,7 +341,7 @@ sub parseinvoicedata(){
           
         }
         if (($p =~ /.+Repas/) ){
-          my ($rn,$p1,$e1) = $p =~ m/.+Repas.+\s+(\d+)\s+([\s|\d]+,\d{1,2})\s+([\s|\d]+,\d{1,2}).+$/;
+          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/,/\./;
           $p1 =~ s/\ //;
@@ -348,7 +350,7 @@ sub parseinvoicedata(){
           $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}).+$/;
+          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/\ //;
@@ -357,7 +359,7 @@ sub parseinvoicedata(){
           $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}).+$/;
+          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/\ //;
@@ -366,7 +368,7 @@ sub parseinvoicedata(){
           $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}).+$/;
+          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/\ //;
@@ -375,49 +377,49 @@ sub parseinvoicedata(){
           $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}).+$/;
+               my ($e1) = $p =~ m/.+Participation totale de l.Etat\s+([\s|\d]+\,\d{1,2}).+$/;
                $e1 =~ s/,/\./;
                $e1 =~ s/\ //;
                $pxdata->{benefitamount} = $e1;
         }
         if ($p =~ /Participa..o total do Estado/){
-               my ($e1) = $p =~ m/.+Participa..o total do Estado\s+([\s|\d]+,\d{1,2}).+$/;
+               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}).+$/;
+               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}).+$/;
+               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/)) {
-          my ($m1) = $p =~ m/.+Montant\s.+\sr.+gler\s+([\s|\d]+,\d{1,2}).+$/;
+          my ($m1) = $p =~ m/.+Montant\s.+\sr.+gler\s+([\s|\d]+\,\d{1,2}).+$/;
           $m1 =~ s/,/\./;
           $m1 =~ s/\ //;
           $pxdata->{totalamount} = $m1;
         }
         if (($p =~ /Montante\sa\spagar/)) {
-          my ($m1) = $p =~ m/.+Montante\sa\spagar\s+([\s|\d]+,\d{1,2}).+$/;
+          my ($m1) = $p =~ m/.+Montante\sa\spagar\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}).+$/;
+          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}).+$/;
+          my ($m1) = $p =~ m/\s+Ze bezuelen\s+([\s|\d]+\,\d{1,2}).+$/;
           $m1 =~ s/,/\./;
           $m1 =~ s/\ //;
           $pxdata->{totalamount} = $m1;

diff --git a/app_v3/chrome/content/web/js/child.js b/app_v3/chrome/content/web/js/child.js
index 87b0fa3..2bc152e 100644 (file)
--- a/app_v3/chrome/content/web/js/child.js
+++ b/app_v3/chrome/content/web/js/child.js
@@ -451,7 +451,7 @@ function dlg_planning(uuid, type, planuuid) {
         inssql += ((plandata.sqldata[pl].tuelunch != 1)?"'" + plandata.sqldata[pl].tuelunch + "'":'null') +",";
         inssql += ((plandata.sqldata[pl].wedlunch != 1)?"'" + plandata.sqldata[pl].wedlunch + "'":'null') +",";
         inssql += ((plandata.sqldata[pl].thulunch != 1)?"'" + plandata.sqldata[pl].thulunch + "'":'null') +",";
-        inssql += ((plandata.sqldata[pl].frilunch != 1)?"'" + plandata.sqldata[pl].frilunch + "'":'null') +"";
+        inssql += ((plandata.sqldata[pl].frilunch != 1)?"'" + plandata.sqldata[pl].frilunch + "'":'null') +",";
         inssql += ((plandata.sqldata[pl].satlunch != 1)?"'" + plandata.sqldata[pl].satlunch + "'":'null') +"";
         inssql += ");";