remove backup and free version 3.18.2_beta0
authorKilian Saffran <ksaffran@dks.lu>
Mon, 26 Mar 2018 06:33:43 +0000 (08:33 +0200)
committerKilian Saffran <ksaffran@dks.lu>
Mon, 26 Mar 2018 06:33:43 +0000 (08:33 +0200)
26 files changed:
.settings/org.eclipse.core.resources.prefs
Tools/pdfextract.pl
app_v3/chrome.manifest_basic
app_v3/chrome.manifest_free [deleted file]
app_v3/chrome.manifest_localmanager
app_v3/chrome/content/creorga_free.xul [deleted file]
app_v3/chrome/content/js/init.js
app_v3/chrome/content/js/init_free.js [deleted file]
app_v3/chrome/content/js/tools.js
app_v3/chrome/content/modules/accounting/accounting_free.xul [deleted file]
app_v3/chrome/content/modules/accounting/js/accounting.js
app_v3/chrome/content/modules/calendar/calendar_free.xul [deleted file]
app_v3/chrome/content/modules/calendar/calvacancy_free.html [deleted file]
app_v3/chrome/content/modules/default_free/default_free.xul [deleted file]
app_v3/chrome/content/modules/logbook/logactivity_free.html [deleted file]
app_v3/chrome/content/modules/logbook/logbook_free.xul [deleted file]
app_v3/chrome/content/modules/logbook/logchild_free.html [deleted file]
app_v3/chrome/content/modules/logbook/logcominterne_free.html [deleted file]
app_v3/chrome/content/modules/staff/coworker_free.html [deleted file]
app_v3/chrome/content/modules/support/backup.html [deleted file]
app_v3/chrome/content/modules/support/js/backup.js [deleted file]
app_v3/chrome/content/modules/support/multisite.html
app_v3/chrome/content/modules/support/multisite_basic.html [deleted file]
app_v3/chrome/content/modules/support/support.xul
app_v3/chrome/content/modules/support/support_basic.xul [deleted file]
app_v3/chrome/content/modules/support/support_free.xul [deleted file]

index dbf848f..340c084 100644 (file)
@@ -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
index ff4abd3..f301956 100644 (file)
@@ -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;
index 36f0135..c33db3e 100644 (file)
@@ -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 (file)
index 331659e..0000000
+++ /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
index 6cf4224..2696733 100644 (file)
@@ -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 (file)
index df9974d..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://creorga/content/creorga.css" type="text/css"?>
-<window id="winmain"
-        title="CreOrga"
-        xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        windowtype="xulcreorga"
-        sizemode="maximized"
-        hidechrome="false"
-        fullscreenbutton="false"
-        minheight="700"
-        minwidth="1200"
-        onload="system.setappdata();" onclose="system.closeapp();">
-  <!--onload="system.sysgetdata(this);"-->
-<!--        width="1024"
-        height="800" width="1280"
-        height="700"-->
-<script type="application/javascript" src="chrome://creorga/content/js/preferences.js" />
-<script type="application/javascript" src="chrome://creorga/content/js/database.js" />
-<script type="application/javascript" src="chrome://creorga/content/js/system.js" />
-<script type="application/javascript" src="chrome://creorga/content/js/license.js" />
-<!--<script type="application/javascript" src="chrome://creorga/content/js/tools.js" />-->
-<script type="application/javascript" src="chrome://creorga/content/js/navigation.js" />
-<script type="application/javascript" src="chrome://creorga/content/js/init.js" />
-<script type="application/javascript" src="chrome://creorga/content/js/print.js" />
-<script type="application/javascript" src="chrome://creorga/content/js/data.js" />
-<deck selectedIndex="0" id="deckglobal" flex="1">
-  <box flex="1" id="vw_loading" >
-    <hbox flex="1" pack="center">
-        <vbox pack="center">
-        <image src="chrome://creorga/content/img/logo.png" />
-        <description  style="font-weight: bold; font-size: 30px;text-decoration: blink;" value="Attendez, chargement de l'application!" id="apploadmsg" />
-        </vbox>
-    </hbox>
-  </box>
-  <box flex="1" id="vw_license">
-    <hbox flex="1" pack="center">
-      <vbox pack="center">
-        <image src="chrome://creorga/content/img/logo.png" />
-        
-        <description id="licerror" style="font-size: 20px; color: red;" value="Erreur!" hidden="true"/> 
-        <!--<checkbox label="Connecter une Crèche partagé existant" style="font-size: 20px;" id="chk_setcreche" oncommand="license.setcreche();"/>
-                <vbox id="vbox_liccreche" style="display: none;">
-                <hbox>
-                  <label value="ID Globale"  style="font-size: 20px;"/>
-                  <textbox flex="1" id="lic_idglobale" style="font-size: 16px;"/>
-                </hbox>
-                <hbox>
-                  <label value="Dossier partagé" style="font-size: 20px;"/>
-                  <textbox style="font-size: 16px;" flex="1" id="lic_localpath"/><button label="..." onclick="license.browsefolder();" style="font-size: 20px;"/>
-                </hbox>
-                </vbox>-->
-        <button style="font-size: 20px;" label="Activer" oncommand="license.activate();"/>
-        
-      </vbox>
-    </hbox>
-  </box>
-  <box flex="1" id="vw_app">
-<vbox flex="1">
-<toolbox>
-        <toolbar id="co_maintoolbar" style="-moz-appearance: none;">
-          <toolbarbutton class="btn btn-default" id="tbb_creorga" label="Creorga" image="img/creorga32.png" orient="vertical" oncommand="navigation.load_appview('home',null,null,null);"/>
-          <toolbarbutton class="btn btn-default" id="tbb_childs" insertafter="tbb_creorga" label="Enfants" image="img/child.png" orient="vertical" oncommand="navigation.load_appview('childs_basic',null,null,'Enfants');"/>
-          <!--<toolbarbutton class="btn btn-default" id="tbb_presences" label="Présences" image="img/presence.png" orient="vertical" oncommand="navigation.load_appview('presences',null,null,'Présences');"/>-->
-          <toolbarspacer id="tbb_space" flex="1" />
-          <toolbarbutton class="btn btn-default" id="tbb_about" type="menu" label="Info" image="img/info2.png" orient="vertical" >
-            <menupopup class="tlbpopup" id="pophelp">
-              <menuitem label="About Creorga" id="mnuabout" oncommand="system.showdlgabout();" />
-            </menupopup>
-          </toolbarbutton>
-        </toolbar>
-        <toolbar style="-moz-appearance: none; background-color: #000; color: #fff;">
-                <label style="font-size: 18px; font-weight: bold; background-color: #000; color: #fff;" id="curpage" value="" />
-                <toolbarspacer flex="1" style="background-color: #000;"/>
-                <label style="font-size: 18px; background-color: #000; color: #fff;" id="infoheader" value="" />
-                <toolbarspacer flex="1" style="background-color: #000;"/>
-                <label  style="font-size: 18px; font-weight: bold; background-color: #000; color: #fff;" id="curcreche" value="" />
-        </toolbar>
-      </toolbox>
-<deck selectedIndex="0" id="views" flex="1">
-  <box flex="1" id="vw_application">
-    <browser type="content-primary" id="brw_application" flex="1" src="chrome://creorga/content/web/home.html" />
-  </box>
-</deck>
-    </vbox>
-  </box>
-  <box flex="1" id="vw_license">
-    <hbox flex="1" pack="center">
-      <vbox pack="center">
-        <image src="chrome://creorga/content/img/logo.png" />
-        
-        <description id="driveerror" style="font-size: 20px; color: red;" value="Impossible de connecter au dossier partagé!"/>
-        <description id="drivesolution" style="font-size: 20px;" value="Verifier la connection vers le dossier partagé et redémarrer l'application!"/>
-        <checkbox label="Connecter une Crèche partagé existant" style="font-size: 20px;" id="chk_setcreche" oncommand="license.setcreche();"/>
-                <vbox id="vbox_connectdrive" style="display: none;">
-                <hbox>
-                  <label value="ID Globale"  style="font-size: 20px;"/>
-                  <textbox flex="1" id="lic_idglobale" style="font-size: 16px;" value=""/>
-                </hbox>
-                <hbox>
-                  <label value="Dossier partagé" style="font-size: 20px;"/>
-                  <textbox style="font-size: 16px;" flex="1" id="lic_localpath"/><button label="..." onclick="license.browsefolder();" style="font-size: 20px;"/>
-                </hbox>
-                </vbox>
-        <button style="font-size: 20px;" label="Activer" oncommand="license.activate();"/>
-        <!--<button style="font-size: 20px;" label="Démarrer la version d'évaluation" oncommand="license.activatefree();"/>-->
-      </vbox>
-    </hbox>
-  </box>
-</deck>
-<statusbar>
-    <statusbarpanel label="Creorga" />
-    <statusbarpanel flex="1"  />
-    <statusbarpanel id="stbversion" label="Version XX.XX.XX" />
-  </statusbar>
-
-</window>
index 67eaa7c..93738d9 100644 (file)
@@ -28,14 +28,15 @@ else {
                    var nx = { "view":"multisite","module":"support","header":"Configuration Sites"};
                    apppref.setpreference("pageconfig.lastpage", nx);
 
-         }else {
-                 if (apppref.getpreference("support.autobackup") === true) {
-                       tools.backup();
-                 }
-                 if (system.fileexists(system.profilerootdir() + system.sep() + '/checkschema.txt')){
-                       appdb.check_schema();
-                 }
-       }
+         }
+//       else {
+////             if (apppref.getpreference("support.autobackup") === true) {
+////                   tools.backup();
+////             }
+////             if (system.fileexists(system.profilerootdir() + system.sep() + '/checkschema.txt')){
+////                   appdb.check_schema();
+////             }
+//     }
          navigation.load_deck(2);
   }
 
diff --git a/app_v3/chrome/content/js/init_free.js b/app_v3/chrome/content/js/init_free.js
deleted file mode 100644 (file)
index ae67195..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-//Source-code licensed under EUPL v1.1 ( Copyright 2016 By DKS s.à r.l. - Kilian Saffran - Luxembourg ) 
-var loadtimeout = apppref.getpreference("support.loadtimeout");
-Components.utils["import"]("resource://gre/modules/osfile.jsm");
-var xulRuntime = Components.classes["@mozilla.org/xre/app-info;1"]
-                 .getService(Components.interfaces.nsIXULRuntime);
-xulRuntime.invalidateCachesOnRestart();
-
-if (!apppref.getpreference("support.database.currentdb.num")) {
-  navigation.load_deck(1);
-}
-else {
-    if (system.fileexists(system.profilerootdir() + system.sep() + '/checkschema.txt')){
-       appdb.check_schema();
-    }
-   navigation.load_deck(2);
-
-}
-
-
index 7a2a84b..60adfa9 100644 (file)
@@ -4,303 +4,6 @@ Components.utils["import"]("resource://gre/modules/NetUtil.jsm");
 Components.utils["import"]("resource://gre/modules/FileUtils.jsm");
 var tools = {
   waitdlg: null,
-  backup: function(pbkpdir=null) {
-    var datadir = FileUtils.File(curcfg.path.local);
-    var bkpdir = FileUtils.File(curcfg.path.local + system.sep() + 'backup');
-    if (pbkpdir) {
-      //"bkpdir: " + pbkpdir.path + "\n");
-      bkpdir = FileUtils.File(pbkpdir.path);
-    }
-     //dump("bkpdir: " + bkpdir.path + "\n");
-    if (!system.fileexists(datadir.path)){
-      return;
-    }
-    if (!system.fileexists(bkpdir.path)){
-      bkpdir.create(1,0755);
-    }
-    var cdate = new Date();
-    var zipfile = FileUtils.File(bkpdir.path + system.sep() + 'creorga_' + curcfg.uuid +'_' +cdate.toLocaleFormat("%Y%m%d")+ ".zip");
-    if (pbkpdir){
-      zipfile = FileUtils.File(bkpdir.path + system.sep() + 'creorga_' + curcfg.uuid +'_' +cdate.toLocaleFormat("%Y%m%d%H%M%S")+ ".zip");
-    }
-    
-    var pr = {PR_RDONLY: 0x01, PR_WRONLY: 0x02, PR_RDWR: 0x04, PR_CREATE_FILE: 0x08, PR_APPEND: 0x10, PR_TRUNCATE: 0x20, PR_SYNC: 0x40, PR_EXCL: 0x80};
-    var zipWriter = Components.classes["@mozilla.org/zipwriter;1"]
-                .createInstance(Components.interfaces.nsIZipWriter);
-    zipWriter.open(zipfile, pr.PR_WRONLY | pr.PR_CREATE_FILE | pr.PR_TRUNCATE);
-    var ftoadd = FileUtils.File(curcfg.path.local + system.sep() + curcfg.uuid + '.sqlite');
-    var saveasfile = system.getFileName(curcfg.uuid + '.sqlite');
-    zipWriter.addEntryFile(saveasfile,zipWriter.COMPRESSION_NONE, ftoadd, false);
-    zipWriter.close();
-    if (!pbkpdir){
-      var bdata = system.getBackups(bkpdir.path);
-      if (bdata.length > 30) {
-        var ftor = bdata.length-30; 
-        var cbar = []; 
-        for (var bd in bdata){
-          cbar.push(bdata[bd].path);
-        }
-        cbar = cbar.sort();
-        for (var i=0;i<ftor;i++){
-          OS.File.remove(cbar[i],{ignoreAbsent:true});
-        }
-      }
-    }
-    return zipfile;
-  },
-  restoredata: function(file){
-    
-    try {
-      var zipReader = Components.classes["@mozilla.org/libjar/zip-reader;1"].createInstance(Components.interfaces.nsIZipReader);
-      var restoreFile = new FileUtils.File(file);
-      zipReader.open(restoreFile);
-    
-      var entries = zipReader.findEntries('*'); //we use asterik because we want EVERYTHING listed out
-      while (entries.hasMore()) {
-        var entryPointer = entries.getNext();
-
-        var fout = new FileUtils.File(curcfg.path.local + system.sep() + entryPointer);
-
-        zipReader.extract(entryPointer,fout);
-      }
-      zipReader.close();
-      
-        appdb.check_schema();
-      
-    } catch(ex){
-      //dump("Error restoring file! " + ex + "\n");
-    }
-    globelreq.send_request({page:'updatesiteslist',data:null});
-    //multisite_reader.getsites();
-  },
-  exportdata: function(){
-    try {  
-      var lastdir = apppref.getpreference("support.lastfiledir");
-      var nsIFilePicker = Components.interfaces.nsIFilePicker;
-      var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
-      fp.init(window, "selectionner le dossier d'export", nsIFilePicker.modeGetFolder);
-      //fp.appendFilter("PDF", "*.pdf");
-      if (lastdir !== '') {
-        var nsILocalFile= Components.interfaces.nsILocalFile;
-        var f = Components.classes["@mozilla.org/file/local;1"].createInstance(nsILocalFile);
-        f.initWithPath(lastdir);
-        fp.displayDirectory = f;
-      }
-      var res = fp.show();
-      if (res != nsIFilePicker.returnCancel) {
-        var exportdir = fp.file;
-        apppref.setpreference("support.lastfiledir",exportdir.path);
-        //get all subfolders
-        var filearray = [];
-        var expdirarray = [];
-        var dir = new FileUtils.File(curcfg.path.local + system.sep() + "reports" + system.sep() + curcfg.uuid);
-        if (system.fileexists(dir.path)){
-          var entries = dir.directoryEntries;
-          while(entries.hasMoreElements()) {
-            var entry = entries.getNext().QueryInterface(Components.interfaces.nsIFile);
-            if (entry.isFile()) {
-              filearray.push(entry.path);
-            }
-          }
-          expdirarray.push("reports");
-          expdirarray.push("reports" + system.sep() + curcfg.uuid);
-        }
-        dir = new FileUtils.File(curcfg.path.local + system.sep() + "imports" + system.sep() + curcfg.uuid);
-        if (system.fileexists(dir.path)){
-          var entries2 = dir.directoryEntries;
-          while(entries2.hasMoreElements()) {
-            var entry2 = entries2.getNext().QueryInterface(Components.interfaces.nsIFile);
-            if (entry2.isFile()) {
-              filearray.push(entry2.path);
-            }
-          }
-          expdirarray.push("imports");
-          expdirarray.push("imports" + system.sep() + curcfg.uuid);
-        }
-        //create dirs in exportpath
-        for (var ed in expdirarray){
-          var cexpdir = new FileUtils.File( exportdir.path + system.sep() + expdirarray[ed]);
-      
-          if (!cexpdir.exists()) {
-            cexpdir.create(1,0755);
-          }
-          if (system.os != "WINNT") {
-            
-          }
-        }
-        //copy files
-        var filex= [];
-        for (var f in filearray){
-          var expfile = filearray[f];
-          var nfile = expfile.substring(curcfg.path.local.length);
-          var fname = system.getFileName(nfile);
-          var dname = exportdir.path +system.getDirectory(nfile);
-     
-          var ef =  new FileUtils.File(expfile);
-          var de = new FileUtils.File(dname);
-          //"CopyTO: " + de.path + "file: "+ fname + "\n");
-          ef.copyTo(de,fname);
-          filex.push(nfile);
-        }
-        var nzipfile = tools.backup(exportdir);
-        
-
-        var expdata = {"db":system.getFileName(nzipfile.path),"dir":expdirarray,"files":filex};
-
-        expfname = system.getFileName(nzipfile.path);
-        expfname = expfname.substring(0,expfname.length-3) + "def";
-        system.WriteTextFile(JSON.stringify(expdata),exportdir.path + system.sep() + expfname);
-        system.popup("Export des données!","Les données ont été exportées vers "+ exportdir.path +"\n");
-        
-      }
-    } catch(ex){
-      system.popup("Erreur d'Export!","L'export des données n'a pas completement fonctionné !\n");
-      //dump("Error Exporting Data! " + ex + "\n");
-    }
-  },
-  importdata: function(){
-    try {  
-      var lastdir = apppref.getpreference("support.lastfiledir");
-      var nsIFilePicker = Components.interfaces.nsIFilePicker;
-      var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
-      fp.init(window, "selectionner fichier (*.def)", nsIFilePicker.modeOpen);
-      fp.appendFilter("Export definition", "*.def");
-      if (lastdir != '') {
-        var nsILocalFile= Components.interfaces.nsILocalFile;
-        var f = Components.classes["@mozilla.org/file/local;1"].createInstance(nsILocalFile);
-        f.initWithPath(lastdir);
-        fp.displayDirectory = f;
-      }
-      var res = fp.show();
-      if (res != nsIFilePicker.returnCancel) {
-        importok = true;
-        var deffile = fp.file;
-        apppref.setpreference("support.lastfiledir",system.getDirectory(deffile.path));
-        var strdefdata = system.readLocalTextFile(deffile.path);
-        var defimpdata = JSON.parse(strdefdata);
-        //createdirs if not exists
-        for (var dx in defimpdata.dir) {
-          var cpath = defimpdata.dir[dx];
-          cpath = cpath.replace(/\\/g,system.sep());
-          cpath = cpath.replace(/\//g,system.sep());
-          //var acpath = cpath.split(system.sep());
-          var cx = new FileUtils.File(curcfg.path.local + cpath );
-          if (!system.fileexists(cx.path)){
-            cx.create(1,0755);
-          }
-        }
-        //copy files
-        for (var fx in defimpdata.files) {
-          try {
-            var cfile = defimpdata.files[fx];
-            cfile = cfile.replace(/\\/g,system.sep());
-            cfile = cfile.replace(/\//g,system.sep());
-            var cpyf = system.getDirectory(deffile.path)  + cfile;
-            var cpyt = system.profiledir() + cfile;
-            var impf =  new FileUtils.File(cpyf);
-            var impdirto = new FileUtils.File(system.getDirectory(cpyt));
-            var impfname = system.getFileName(cpyt);
-            impf.copyTo(impdirto,impfname);
-          } catch(e){
-            //dump("Error importing file " + de.path +" "+ e);
-            importok=false;
-          }
-        }
-        //restore databases
-
-        tools.restoredata(system.getDirectory(deffile.path) + system.sep() + defimpdata.db);
-        if (importok == true) {
-          system.popup("Import des données!","Les données ont été importées\n");
-        }else {
-          system.popup("Import des données!","Pas tous les données ont été importées\n");
-        }
-        
-      }
-    } catch(ex){
-      system.popup("Erreur d'import!","L'import des données n'a pas completement fonctionné !\n");
-      //dump("Error importing files! " + ex + "\n");
-    }
-  },
-  readinvoicepdf: function(){
-    try {  
-      var lastdir = apppref.getpreference("support.lastfiledir");
-      var nsIFilePicker = Components.interfaces.nsIFilePicker;
-      var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
-      fp.init(window, "selectionner fichier PDF", nsIFilePicker.modeOpen);
-      fp.appendFilter("PDF", "*.pdf");
-      if (lastdir != '') {
-        var nsILocalFile= Components.interfaces.nsILocalFile;
-        var f = Components.classes["@mozilla.org/file/local;1"].createInstance(nsILocalFile);
-        f.initWithPath(lastdir);
-        fp.displayDirectory = f;
-      }
-      var res = fp.show();
-      if (res != nsIFilePicker.returnCancel) {
-        var pdffile = fp.file;
-        apppref.setpreference("support.lastfiledir",system.getDirectory(pdffile.path));
-
-        var cname = appdb.dbquery("select uuid from creche LIMIT 1;");
-        cruuid = cname.sqldata[0].uuid;
-        var importpath = FileUtils.File(curcfg.path.local  + system.sep() +"imports" + system.sep() + cruuid);
-        var args = ["-db",'"' + appdb.dbFile.path + '"',"-p",'"' +pdffile.path + '"',"-o",'"' + importpath.path + '"',"-t",'"' + system.toolsdir() + '"',"-x","inv","-l", '"' + system.profiledir() + system.sep() + 'importerror.log"'];
-        
-        var binpdf = system.toolsdir() + system.sep() + "pdfextract.exe";
-        if (system.os != "WINNT") {
-          binpdf = system.toolsdir() + system.sep() + "pdfextract";
-        }
-        //dump(binpdf + " " +JSON.stringify(args) + "\n");
-        system.popup("Import Factures!","Import du PDF '"+ pdffile.path +"' en cours!\n");
-        system.runcmdline(binpdf,args,function(data){
-          var strx = apppref.getpreference("pageconfig.lastpage");
-          var x = JSON.parse(strx);
-          
-          if (x.module == 'accounting') {
-            navigation.load_appview(x.view,x.module,null,x.header);
-          }
-          system.popup("Import Factures!","Les factures ont été importées!\n");
-        });
-        
-      }
-    } catch(ex){
-      system.popup("Erreur d'import!","Une Erreur s'est produite pendant l'import des factures!\n");
-      //dump("Error importing invoice PDF! " + ex + "\n");
-    }
-  },
-  readbenefitstatement: function(){
-    try {
-      var lastdir = apppref.getpreference("support.lastfiledir");
-      var nsIFilePicker = Components.interfaces.nsIFilePicker;
-      var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
-      fp.init(window, "selectionner fichier PDF", nsIFilePicker.modeOpen);
-      fp.appendFilter("PDF", "*.pdf");
-      if (lastdir != '') {
-        var nsILocalFile= Components.interfaces.nsILocalFile;
-        var f = Components.classes["@mozilla.org/file/local;1"].createInstance(nsILocalFile);
-        f.initWithPath(lastdir);
-        fp.displayDirectory = f;
-      }
-      var res = fp.show();
-      if (res != nsIFilePicker.returnCancel) {
-        var pdffile = fp.file;
-        apppref.setpreference("support.lastfiledir",system.getDirectory(pdffile.path));
-
-        var cname = appdb.dbquery("select uuid from creche LIMIT 1;");
-        cruuid = cname.sqldata[0].uuid;
-        var importpath = FileUtils.File(curcfg.path.local  + system.sep() +"imports" + system.sep() + cruuid);
-        var args = ["-db",'"' + appdb.dbFile.path + '"',"-p",'"' + pdffile.path + '"',"-o",'"' + importpath.path +'"',"-t",'"' +  system.toolsdir() + '"',"-x","stmt","-l",'"' + system.profiledir() + system.sep() + 'importerror.log"'];
-        var binpdf = system.toolsdir() + system.sep() + "pdfextract.exe";
-        if (system.os != "WINNT") {
-          binpdf = system.toolsdir() + system.sep() + "pdfextract";
-        }
-        system.runcmdline(binpdf,args,function(data){
-          system.popup("Import Prestations!","Les Prestations ont été importées!\n");
-        });
-      }
-    } catch(ex){
-      system.popup("Erreur d'import!","Une erreur s'est produite pendant l'import des prestations!\n");
-      //dump("Error importing statement PDF! " + ex + "\n");
-    }
-  },
   movecreche: function(oldfolder,newfolder,cuuid,dbnum){
     //"Move Form: " + oldfolder + "\nTO: " + newfolder + "\nuuid:" + cuuid + "\ndbnum: " + dbnum + "\n");
     try {
diff --git a/app_v3/chrome/content/modules/accounting/accounting_free.xul b/app_v3/chrome/content/modules/accounting/accounting_free.xul
deleted file mode 100644 (file)
index 9344d16..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE overlay PUBLIC "-//MOZILLA//DTD XUL V1.0//EN"
-"http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<overlay id="ov_accounting" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-  <toolbar id="co_maintoolbar" style="-moz-appearance: none;">
-    <toolbarbutton  type="menu"  class="btn btn-default" id="tbb_accounting" insertafter="tbb_presences" label="Décompte" image="modules/accounting/img/accounting.png" orient="vertical">
-    <menupopup class="tlbpopup" style="text-align: left;">
-      <label value="Décompte" style="font-weight: bold;"/>
-      <menuitem label="par mois" oncommand="navigation.load_appview('accounting','accounting', null,'Décompte par mois');"  id="mnuaccountingmonth"/>
-      <menuitem label="par enfant" oncommand="navigation.load_appview('accountingchild','accounting',null,'Décompte par enfant');"  id="mnuaccountingchild"/>
-      <menuitem label="factures ouvertes" oncommand="navigation.load_appview('accountingopeninvoice','accounting',null,'Factures ouvertes');"  id="mnuaccountingopeninvoice"/>
-      <menuseparator />
-      <label value="Bilan"  style="font-weight: bold;"/>
-      <menuitem label="Bilan annuelle" oncommand="navigation.load_appview('accountingyear','accounting',null,'Bilan annuelle');"  id="mnuaccountingyear"/>
-    </menupopup>
-    </toolbarbutton>
-  </toolbar>
-</overlay>
index 2ed092d..054d46d 100644 (file)
@@ -529,16 +529,16 @@ function onpreviousmonth() {
 }
 
 function generatecsv(){
-//     var lastdir = '';
-//     if (pconfig.lastdir){
-//             lastdir = pconfig.lastdir;
-//     }
-       var expfolder = system.selectdirectory('',"Sélection dossier!");
-       dump("EXPFOLDER:" + expfolder);
+       var lastdir = '';
+       if (pconfig.lastdir){
+               lastdir = pconfig.lastdir;
+       }
+       var expfolder = system.selectdirectory(lastdir,"Sélection dossier!");
+       //dump("EXPFOLDER:" + expfolder);
        if (!expfolder){
                return;
        }else {
-               pconfig.lastdir = expfolder;
+               pconfig.lastdir = expfolder.path;
                apppref.setpreference("pageconfig.accounting",pconfig);
        }
        var val = $("#accmonth").val();
diff --git a/app_v3/chrome/content/modules/calendar/calendar_free.xul b/app_v3/chrome/content/modules/calendar/calendar_free.xul
deleted file mode 100644 (file)
index 5e24bcd..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE overlay PUBLIC "-//MOZILLA//DTD XUL V1.0//EN"
-"http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<overlay id="ov_calendar" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-  <toolbar id="co_maintoolbar" style="-moz-appearance: none;">
-    <toolbarbutton   type="menu" class="btn btn-default" id="tbb_calendar" insertafter="tbb_staff" label="Calendriers" image="modules/calendar/img/calendar.png" orient="vertical">
-    <menupopup class="tlbpopup" style="text-align: left;">
-      <menuitem label="Organisation Enfants" oncommand="navigation.load_appview('calchilds','calendar',null,'Organisation interne (Enfants)');"  id="mnuchilds"/>
-      <menuitem label="Organisation Personnel" oncommand="navigation.load_appview('calactivity','calendar',null,'Organisation interne (Personnel)');"  id="mnucalactivity"/>
-      <menuitem label="Congés" oncommand="navigation.load_appview('calvacancy_free','calendar',null,'Congés');"  id="mnucalvacancy"/>
-      <menuitem label="Jours feriés / Vacances" oncommand="navigation.load_appview('calglobal','calendar',null,'Jours feriés / Vacances');"  id="mnucalglobal"/>
-    </menupopup>
-    </toolbarbutton>
-  </toolbar>
-</overlay>
\ No newline at end of file
diff --git a/app_v3/chrome/content/modules/calendar/calvacancy_free.html b/app_v3/chrome/content/modules/calendar/calvacancy_free.html
deleted file mode 100644 (file)
index 4738e87..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
-
-<html>
-<head>
-  <title>Congé</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta http-equiv="cache-control" content="max-age=0" />
-  <meta http-equiv="cache-control" content="no-cache" />
-  <meta http-equiv="expires" content="0" />
-  <meta http-equiv="expires" content="Tue, 01 Jan 1970 1:00:00 GMT" />
-  <meta http-equiv="pragma" content="no-cache" />
-  <link href="../../web/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-  <!--<link href="../../web/css/bootstrap-theme.min.css" rel="stylesheet" type="text/css">-->
-  <link href="../../web/css/datatables.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/dataTables.bootstrap.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-datetimepicker.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-timepicker.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-multiselect.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/glyphicons.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/creorga.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/calendar.css" rel="stylesheet" type="text/css">
-</head>
-
-<body>
-  <div class="container-fluid" style="padding-top: 5px;">
-    
-    <div class="form-inline">
-  <div class="input-group month btn-group">
-    <span class="input-group-addon">du mois:</span>
-    <input type="date" class="form-control" value="" placeholder="mm.yyyy" style="width: 80px;" id="calmonth" onchange="set_calmonth();">
-    <span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-  </div>
-  <button class="btn btn-primary" onclick="onpreviousmonth();"><span class="glyphicon glyphicon-chevron-left"></span></button>
-  <button class="btn btn-primary" onclick="onnextmonth();"><span class="glyphicon glyphicon-chevron-right"></span></button>
-
-<!--   <div class="input-group" id="divfiltercreche"> -->
-<!--       <div class="input-group-addon"><span class="glyphicon glyphicon-filter" aria-hidden="true"></span>&nbsp;Crèche</div> -->
-<!--   <select id="filter_creche" multiple="multiple" onchange="onselcreche(this.id);"> -->
-    
-<!--   </select> -->
-  
-<!--   </div>     -->
-      
-      
-    </div>
-
-    <div class="row" id="view_table">
-      <table id="tbl_timetable" class="table table-striped table-bordered">
-        
-      </table>
-    </div>
-    
-        
-        </div>
-  </div>
-  <script src="../../web/js/jquery.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap.min.js" type="text/javascript"></script>
-  <script src="../../web/js/datatables.min.js" type="text/javascript"></script>
-  <script src="../../web/js/moment-with-locales.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-datetimepicker.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-timepicker.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-multiselect.js" type="text/javascript"></script>
-  <script src="js/rrule.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/preferences.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/navigation.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/database.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/system.js" type="text/javascript"></script>
-  <script src="../../web/js/labels.js" type="text/javascript"></script>
-  <script src="../../web/js/creorga.js" type="text/javascript"></script>
-  <script src="js/calvacancy_free.js" type="text/javascript"></script>
-</body>
-</html>
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 (file)
index 0488464..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE overlay PUBLIC "-//MOZILLA//DTD XUL V1.0//EN"
-"http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<overlay id="ov_staff" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-  <toolbar id="co_maintoolbar" style="-moz-appearance: none;">
-    <toolbarbutton class="btn btn-default" id="tbb_childs" insertafter="tbb_creorga" label="Enfants" image="img/child.png" orient="vertical" oncommand="navigation.load_appview('childs',null,null,'Enfants');"/>
-    <toolbarbutton class="btn btn-default" id="tbb_creche" insertbefore="tbb_space" label="Crèche" image="img/creche.png" orient="vertical" oncommand="navigation.load_appview('creche',null, null,'Crèche');" />
-    <toolbarbutton class="btn btn-default" id="tbb_waitlist" insertafter="tbb_creche" label="List d'attente" image="img/waitlist.png" orient="vertical" oncommand="navigation.load_appview('waitlist', null, null, 'Listes d attente');" /> 
-
-  </toolbar>
-</overlay>
\ 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 (file)
index 7e0f5f6..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-<!DOCTYPE html>
-
-<html lang="fr">
-<head>
-  <meta charset="utf-8">
-  <title>Livret des activités</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta http-equiv="cache-control" content="max-age=0" />
-  <meta http-equiv="cache-control" content="no-cache" />
-  <meta http-equiv="expires" content="0" />
-  <meta http-equiv="expires" content="Tue, 01 Jan 1970 1:00:00 GMT" />
-  <meta http-equiv="pragma" content="no-cache" />
-  <link href="../../web/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-  <!--<link href="../../web/css/bootstrap-theme.min.css" rel="stylesheet" type="text/css">-->
-  <link href="../../web/css/datatables.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/dataTables.bootstrap.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-datetimepicker.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-timepicker.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-multiselect.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/glyphicons.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/summernote.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/creorga.css" rel="stylesheet" type="text/css">
-  <style type="text/css">
-    .dataTables_filter {
-      margin-top: 15px;
-    }
-  </style>
-</head>
-
-<body>
-  <div class="container-fluid"  style="padding-top: 5px;">
-    <div class="form-inline" >
-      <div class="input-group month btn-group">
-            <span class="input-group-addon">du mois:</span>
-            <input type="date" class="form-control" value="" placeholder="mm.yyyy" style="width: 80px;" id="logmonth">
-            <span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-          </div>
-            <button class="btn btn-primary" onclick="onpreviousmonth();"><span class="glyphicon glyphicon-chevron-left"></span></button>
-            <button class="btn btn-primary" onclick="onnextmonth();"><span class="glyphicon glyphicon-chevron-right"></span></button>
-      <button class="btn btn-primary" onclick="newlogactivity();"><span class="glyphicon glyphicon-plus"></span> Activité</button>
-    
-   </div>
-   <div>
-    <table style="height: calc(100vh - 100px); width: 100%; ">
-      <tbody>
-        <tr>
-          <td style="width: 550px; vertical-align: top;"><table class="display dataTable cell-border" style="width: 100%;" id="tbl_logactivity" role="grid"></table></td>
-          <td style="vertical-align: top; margin-left: 30px;">
-            <div class="form-inline" style="margin-top: 15px; margin-bottom: 10px; margin-left: 10px;">
-                               <button class="btn btn-success" onclick="edit_activitylog();" id="btnedit"><span class="glyphicon glyphicon-pencil"></span> éditer</button>
-                       <button class="btn btn-danger" onclick="confirm_delete_activity();" id="btndelete"><span class="glyphicon glyphicon-remove"></span> supprimer</button>
-                       <!--<button class="btn btn-warning" onclick="confirm_delete_protection();" id="btnprotection"><span class="glyphicon glyphicon-remove"></span> Protection</button>-->
-               </div>
-               <input type="hidden" id="activityloguuid" value="0">
-               
-                <div><strong>Titre:</strong> <span  id="activitylogtitle"></span></div>
-                       <div><strong>Date: </strong><span id="activitylogdatefrom"></span> <strong>au</strong> <span id="activitylogdateto"></span></div>
-               
-          <div style="width: 100%; height: calc(100vh - 200px); background-color: #fff; border: 1px solid grey; border-radius: 10px; display: block; overflow-y: auto; padding: 5px; margin: 5px;" id="activitylogmessage"></div></td>
-        </tr>
-      </tbody>
-    </table>
-   </div>
-   <div class="modal fade" id="confirm_delete_logactivity">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-
-                <h4 class="modal-title">Supprimer Activité</h4>
-              </div><!-- dialog contents -->
-
-              <div class="modal-body">
-                Êtes vous sûre de supprimer cette activité?<br>
-                
-              </div><!-- dialog buttons -->
-
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Non</button> <button onclick="delete_logactivity();" class="btn btn-primary">Oui</button>
-              </div>
-            </div>
-          </div>
-  </div>
-  <div class="modal fade" id="confirm_delete_protection">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-
-                <h4 class="modal-title">Supprimer Protection</h4>
-              </div><!-- dialog contents -->
-
-              <div class="modal-body">
-                Êtes vous sûre de supprimer cette protection?<br>
-                (possibilité de perdre des données pas sauvegardées)
-              </div><!-- dialog buttons -->
-
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Non</button> <button onclick="delete_protection();" class="btn btn-primary">Oui</button>
-              </div>
-            </div>
-          </div>
-  </div>
-  <div class="modal fade" id="edit_activitylog">
-          <div class="modal-dialog"  style="width: 1000px; min-width: 1000px;">
-            <div class="modal-content" >
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-                <h4 class="modal-title">Editer activité</h4>
-              </div>
-              <div class="modal-body" style=" height: 80vh; max-height: height: 80vh; ">
-
-                <div id="frmeditactivitylog">
-                  <input type="hidden" id="loguuid" value="0">
-          <div class="row form-inline" style="margin-left: 30px;">
-                          <label for="logtitle">Titre</label> <input type="text" value="" style="width: 80%;" id="logtitle" class="form-control">
-          </div>
-          <div class="row" style="margin-left: 30px;">
-             <div class="form-inline" id="date-container">
-                          <label for="logdatefrom" style="width: 200px;">Date début / fin</label>
-                          <div id="dt_logdatefrom" class="input-group date">
-                            <input type="date" class="form-control" value="00.00.0000" limits="0" placeholder="dd.mm.yyyy"  id="logdatefrom"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                          </div>
-                        
-                          <div id="dt_logdateto" class="input-group date">
-                            <input type="date" class="form-control" value="00.00.0000" limits="0" placeholder="dd.mm.yyyy" id="logdateto"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                          </div>
-                        </div>
-
-          </div>
-          <textarea class="summernote" type="text" style="width: 100%;" id="logmessage">
-</textarea>
-                                       
-                </div>
-              </div>
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" onclick="removeeditorhost();" class="btn">Annuler</button> <button onclick="save_activitylog();" class="btn btn-primary">OK</button>
-              </div>
-              </div>
-
-              
-            </div>
-          </div>
-   </div>
-   
-  
-  <script src="../../web/js/jquery.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap.min.js" type="text/javascript"></script>
-  <script src="../../web/js/datatables.min.js" type="text/javascript"></script>
-  <script src="../../web/js/moment-with-locales.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-datetimepicker.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-timepicker.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-multiselect.js" type="text/javascript"></script>
-  <script src="../../web/js/summernote.min.js" type="text/javascript"></script>
-  <script src="../../web/js/lang/summernote-fr-FR.min.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/preferences.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/navigation.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/database.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/system.js" type="text/javascript"></script>
-  <script src="../../web/js/labels.js" type="text/javascript"></script>
-  <script src="js/logactivity_free.js" type="text/javascript"></script>
-  <script src="../../web/js/creorga.js" type="text/javascript"></script>
-  
-</body>
-</html>
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 (file)
index 3d89b3d..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE overlay PUBLIC "-//MOZILLA//DTD XUL V1.0//EN"
-"http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<overlay id="ov_logbook" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-  <toolbar id="co_maintoolbar" style="-moz-appearance: none;">
-    <toolbarbutton type="menu" class="btn btn-default" id="tbb_logbook" insertafter="tbb_forms" label="Livrets de bord" image="modules/logbook/img/logbook.png" orient="vertical">
-    <menupopup class="tlbpopup" style="text-align: left;">
-      
-      <label value="Enfants" style="font-weight: bold;"/>
-      <menuitem label="Livret d'évaluation par date" oncommand="navigation.load_appview('logchild_free','logbook',null,'Livret d évaluation des enfants par date');"  id="mnulogchild"/>
-      <menuseparator />
-      <label value="Crèche" style="font-weight: bold;"/>
-      <menuitem label="Livret des activités" oncommand="navigation.load_appview('logactivity_free','logbook',null,'Livret des activités');"  id="mnulogactivity"/>
-      
-    </menupopup>
-    </toolbarbutton>
-  </toolbar>
-</overlay>
\ 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 (file)
index f0f2243..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE html>
-
-<html lang="fr">
-<head>
-  <meta charset="utf-8">
-  <title>Livret d'évaluation des enfants</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta http-equiv="cache-control" content="max-age=0" />
-  <meta http-equiv="cache-control" content="no-cache" />
-  <meta http-equiv="expires" content="0" />
-  <meta http-equiv="expires" content="Tue, 01 Jan 1970 1:00:00 GMT" />
-  <meta http-equiv="pragma" content="no-cache" />
-  <link href="../../web/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/datatables.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/dataTables.bootstrap.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-datetimepicker.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-timepicker.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-multiselect.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/glyphicons.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/summernote.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/creorga.css" rel="stylesheet" type="text/css">
-  <style type="text/css">
-    .dataTables_filter {
-      margin-top: 15px;
-    }
-  </style>
-</head>
-
-<body>
-  <div class="container-fluid"  style="padding-top: 5px;">
-    <div class="form-inline" >
-      <div class="input-group date btn-group">
-            <span class="input-group-addon">date du:</span>
-            <input type="date" class="form-control" value="" placeholder="dd.mm.yyyy" style="width: 120px;" id="logdate" onchange="set_logdate();">
-            <span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-          </div>
-          <button class="btn btn-primary" onclick="onpreviousdate();"><span class="glyphicon glyphicon-chevron-left"></span></button>
-          <button class="btn btn-primary" onclick="onnextdate();"><span class="glyphicon glyphicon-chevron-right"></span></button>
-          <!--<button class="btn btn-default" id="btneditorhost">Editeur: <span id="editorhost"></span></button>
-          <button class="btn btn-danger" id="btnprotection" onclick="confirm_delete_protection();" style="display: none;"><span class="glyphicon glyphicon-remove"></span> protection</button>-->
-   </div>
-   <div>
-    <table style="height: calc(100vh - 100px); width: 100%;">
-      <tbody>
-        <tr>
-          <td style="width: 600px; vertical-align: top; padding-top: 0px;"><table class="display dataTable cell-border" style="width: 100%;" id="tbl_logchild" role="grid"></table></td>
-          <td style="vertical-align: top; padding-top: 0px; ">
-               <input type="hidden" id="childloguuid" value="0">
-               <div class="form-inline" style="margin-top: 15px; margin-bottom: 10px; margin-left: 10px;">
-                       <button class="btn btn-primary" onclick="addchildlog();" id="btnadd"><span class="glyphicon glyphicon-plus"></span> ajouter</button>
-                       <button class="btn btn-success" onclick="edit_childlog();" id="btnedit"><span class="glyphicon glyphicon-pencil"></span> éditer</button>
-                       <!--<button class="btn btn-warning" onclick="confirm_delete_protection();" id="btnprotection"><span class="glyphicon glyphicon-remove"></span> Protection</button>-->
-               </div>
-               <div   style="width: 100%; height: calc(100vh - 150px); background-color: #fff; border: 1px solid grey; border-radius: 10px; display: block; overflow-y: auto; padding: 5px; margin: 5px;" id="childlogmessage"></div>
-          </td>
-        </tr>
-      </tbody>
-    </table>
-    
-   </div>
-   <div class="modal fade" id="confirm_delete_protection">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-
-                <h4 class="modal-title">Supprimer Protection</h4>
-              </div><!-- dialog contents -->
-
-              <div class="modal-body">
-                Êtes vous sûre de supprimer cette protection?<br>
-                (possibilité de perdre des données pas sauvegardées)
-              </div><!-- dialog buttons -->
-
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Non</button> <button onclick="delete_protection();" class="btn btn-primary">Oui</button>
-              </div>
-            </div>
-          </div>
-  </div>
-  <div class="modal fade" id="edit_childlog">
-          <div class="modal-dialog"  style="width: 1000px; min-width: 1000px;">
-            <div class="modal-content" >
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-                <h4 class="modal-title">Editer livret d'évaluation</h4>
-              </div>
-              <div class="modal-body" style=" height: 700px; max-height: 700px ">
-
-                <div id="frmeditchildlog">
-                  <input type="hidden" value="0" id="uuid" />
-                  <input type="hidden" value="0" id="childuuid" />
-                  <textarea style="height: 600px;" class="summernote" type="text"  id="logmessage"></textarea>
-                                       
-                </div>
-              </div>
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" onclick="removeeditorhost();" class="btn">Annuler</button> <button onclick="save_childlog();" class="btn btn-primary">OK</button>
-              </div>
-              </div>
-
-              
-            </div>
-          </div>
-   </div>
-  
-  
-  <script src="../../web/js/jquery.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap.min.js" type="text/javascript"></script>
-  <script src="../../web/js/datatables.min.js" type="text/javascript"></script>
-  <script src="../../web/js/moment-with-locales.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-datetimepicker.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-timepicker.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-multiselect.js" type="text/javascript"></script>
-  <script src="../../web/js/summernote.min.js" type="text/javascript"></script>
-  <script src="../../web/js/lang/summernote-fr-FR.min.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/navigation.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/preferences.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/system.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/database.js" type="text/javascript"></script>
-  <script src="../../web/js/labels.js" type="text/javascript"></script>
-  <script src="js/logchild_free.js" type="text/javascript"></script>
-  <script src="../../web/js/creorga.js" type="text/javascript"></script>
-  
-</body>
-</html>
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 (file)
index 19e2847..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-<!DOCTYPE html>
-
-<html lang="fr">
-<head>
-  <meta charset="utf-8">
-  <title>Communication interne</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta http-equiv="cache-control" content="max-age=0" />
-  <meta http-equiv="cache-control" content="no-cache" />
-  <meta http-equiv="expires" content="0" />
-  <meta http-equiv="expires" content="Tue, 01 Jan 1970 1:00:00 GMT" />
-  <meta http-equiv="pragma" content="no-cache" />
-  <link href="../../web/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-  <!--<link href="../../web/css/bootstrap-theme.min.css" rel="stylesheet" type="text/css">-->
-  <link href="../../web/css/datatables.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/dataTables.bootstrap.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-datetimepicker.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-timepicker.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-multiselect.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/glyphicons.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/summernote.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/creorga.css" rel="stylesheet" type="text/css">
-  <style type="text/css">
-    .dataTables_filter {
-      margin-top: 15px;
-    }
-  </style>
-</head>
-
-<body>
-  <div class="container-fluid"  style="padding-top: 5px;">
-    <div class="form-inline" >
-      <div class="input-group month btn-group">
-            <span class="input-group-addon">du mois:</span>
-            <input type="date" class="form-control" value="" placeholder="mm.yyyy" style="width: 80px;" id="logmonth">
-            <span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-          </div>
-            <button class="btn btn-primary" onclick="onpreviousmonth();"><span class="glyphicon glyphicon-chevron-left"></span></button>
-            <button class="btn btn-primary" onclick="onnextmonth();"><span class="glyphicon glyphicon-chevron-right"></span></button>
-      <button class="btn btn-primary" onclick="newlogmessage();" id="btnaddmessage"><span class="glyphicon glyphicon-plus"></span> Message</button>
-         <!--<button class="btn btn-default" id="btneditorhost">Editeur: <span id="editorhost"></span></button>
-         <button class="btn btn-danger" id="btnprotection" onclick="confirm_delete_protection();" style="display: none;"><span class="glyphicon glyphicon-remove"></span> protection</button>-->
-   </div>
-   <div>
-    <table style="height: calc(100vh - 100px); width: 100%; ">
-      <tbody>
-        <tr>
-          <td style="width: 550px; vertical-align: top;"><table class="display dataTable cell-border" style="width: 100%;" id="tbl_logcominterne" role="grid"></table></td>
-          <td style="vertical-align: top; margin-left: 30px;">
-               <div class="form-inline" style="margin-top: 15px; margin-bottom: 10px; margin-left: 10px;">
-                               <button class="btn btn-success" onclick="edit_cominternelog();" id="btnedit"><span class="glyphicon glyphicon-pencil"></span> éditer</button>
-                       <button class="btn btn-danger" onclick="confirm_delete_cominterne();" id="btndelete"><span class="glyphicon glyphicon-remove"></span> supprimer</button>
-                       <!--<button class="btn btn-warning" onclick="confirm_delete_protection();" id="btnprotection"><span class="glyphicon glyphicon-remove"></span> Protection</button>-->
-               </div>
-               <input type="hidden" id="cominterneloguuid" value="0">
-               <div><strong>Titre:</strong> <span  id="cominternelogtitle"></span></div>
-                       <div><strong>Date: </strong><span id="cominternelogdate"></span></div>
-               
-          <div style="width: 100%; height: calc(100vh - 200px); background-color: #fff; border: 1px solid grey; border-radius: 10px; display: block; overflow-y: auto; padding: 5px; margin: 5px;" id="cominternelogmessage"></div>
-          
-          </td>
-        </tr>
-      </tbody>
-    </table>
-   </div>
-   <div class="modal fade" id="confirm_delete_logcominterne">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-
-                <h4 class="modal-title">Supprimer Message</h4>
-              </div><!-- dialog contents -->
-
-              <div class="modal-body">
-                Êtes vous sûre de supprimer ce message?<br>
-                
-              </div><!-- dialog buttons -->
-
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Non</button> <button onclick="delete_logcominterne();" class="btn btn-primary">Oui</button>
-              </div>
-            </div>
-          </div>
-  </div>
-  <div class="modal fade" id="confirm_delete_protection">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-
-                <h4 class="modal-title">Supprimer Protection</h4>
-              </div><!-- dialog contents -->
-
-              <div class="modal-body">
-                Êtes vous sûre de supprimer cette protection?<br>
-                (possibilité de perdre des données pas sauvegardées)
-              </div><!-- dialog buttons -->
-
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Non</button> <button onclick="delete_protection();" class="btn btn-primary">Oui</button>
-              </div>
-            </div>
-          </div>
-  </div>
-  <div class="modal fade" id="edit_cominternelog">
-          <div class="modal-dialog"  style="width: 1000px; min-width: 1000px;">
-            <div class="modal-content" >
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-                <h4 class="modal-title">Editer communication</h4>
-              </div>
-              <div class="modal-body" style=" height: 80vh; max-height: height: 80vh; ">
-
-                <div id="frmeditcominterne">
-                  <input type="hidden" id="loguuid" value="0">
-          <div class="row form-inline" style="margin-left: 30px;">
-                          <label for="logtitle">Titre</label> <input type="text" value=""  style="width: 80%;" id="logtitle" class="form-control">
-          </div>
-          <div class="row" style="margin-left: 30px;">
-             <div class="form-inline" id="date-container">
-                          <label for="logtimestamp" style="width: 100px;">Date</label>
-                          <div id="dt_logdate" class="input-group date">
-                            <input type="date" class="form-control" value="" limits="0" placeholder="dd.mm.yyyy"  id="logdate"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                          </div>
-                        
-                          
-                        </div>
-
-          </div>
-          <textarea class="summernote"  style="width: 100%;" id="logmessage">
-</textarea>
-                                       
-                </div>
-              </div>
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" onclick="removeeditorhost();" class="btn">Annuler</button> <button onclick="save_cominternelog();" class="btn btn-primary">OK</button>
-              </div>
-              </div>
-
-              
-            </div>
-          </div>
-   </div>
-   
-  
-  <script src="../../web/js/jquery.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap.min.js" type="text/javascript"></script>
-  <script src="../../web/js/datatables.min.js" type="text/javascript"></script>
-  <script src="../../web/js/moment-with-locales.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-datetimepicker.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-timepicker.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-multiselect.js" type="text/javascript"></script>
-  <script src="../../web/js/summernote.min.js" type="text/javascript"></script>
-  <script src="../../web/js/lang/summernote-fr-FR.min.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/preferences.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/navigation.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/database.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/system.js" type="text/javascript"></script>
-  <script src="../../web/js/labels.js" type="text/javascript"></script>
-  <script src="js/logcominterne_free.js" type="text/javascript"></script>
-  <script src="../../web/js/creorga.js" type="text/javascript"></script>
-  
-</body>
-</html>
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 (file)
index f8bd0d2..0000000
+++ /dev/null
@@ -1,651 +0,0 @@
-<!DOCTYPE html>
-
-<html lang="fr">
-<head>
-  <meta charset="utf-8">
-
-  <title>Employé(e)</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta http-equiv="cache-control" content="max-age=0" />
-  <meta http-equiv="cache-control" content="no-cache" />
-  <meta http-equiv="expires" content="0" />
-  <meta http-equiv="expires" content="Tue, 01 Jan 1970 1:00:00 GMT" />
-  <meta http-equiv="pragma" content="no-cache" />
-  <link href="../../web/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-  <!--<link href="../../web/css/bootstrap-theme.min.css" rel="stylesheet" type="text/css">-->
-  <link href="../../web/css/datatables.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/dataTables.bootstrap.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-datetimepicker.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-timepicker.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/glyphicons.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/jquery.minicolors.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/creorga.css" rel="stylesheet" type="text/css">
-</head>
-
-<body>
-
-    <div class="container-fluid">
-        <br/>
-        <!--<span class="pagehead" id="pagehead">Collaborateur</span>&nbsp;-->
-          <input type="hidden" value="" id="staff_uuid">
-                <table style="width: 100%;">
-                  <tbody>
-                    <tr>
-                      <td style="width: 50%">
-                        <form>
-                        <div class="field form-inline">
-                          <label for="staff_surname">Nom / Prénom</label>
-                          <input type="text" value="" id="staff_surname" class="form-control">
-                          <input type="text" value="" id="staff_prename" class="form-control">
-                        </div>
-
-                        <div class="field">
-                          <label for="staff_address">Adresse</label> <input type="text" value="" id="staff_address" class="form-control">
-                        </div>
-
-                        <div class="field form-inline">
-                          <label for="staff_zip">CP / Ville</label>
-                          <input type="text" value="" size="5" id="staff_zip" class="form-control">
-                          <input type="text" value="" id="staff_city" class="form-control">
-                        </div>
-
-                        <div class="field">
-                          <label for="staff_country">Pays</label> <input type="text" value="" id="staff_country" class="form-control">
-                        </div>
-                        <div class="field form-inline">
-                          <label for="staff_phone">Tel / E-Mail</label>
-                          <input type="text" value="" id="staff_phone" class="form-control">
-                          <input type="text" value="" id="staff_email" class="form-control">
-                        </div>
-                        </form>
-                        
-                      </td>
-
-                      <td style="width: 50%;">
-                        <form>
-                        <div class="field form-inline" id="date-container">
-                          <label for="staff_entrydate" style="width: 200px;">Date d'entrée / de sortie</label>
-                          <div id="dt_staff_entrydate" class="input-group date">
-                            <input type="date" class="form-control" value="" limits="0" placeholder="dd.mm.yyyy"  id="staff_entrydate"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                          </div>
-                        
-                          <div id="dt_staff_exitdate" class="input-group date">
-                            <input type="date" class="form-control" value="" limits="0" placeholder="dd.mm.yyyy" id="staff_exitdate"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                          </div>
-                        </div>
-                  
-                        <div class="field">
-                          <label for="staff_jobtitle">Position / Contrat</label> <input type="text" value="" id="staff_jobtitle" class="form-control">
-                        </div>
-                        <table style="width: 100%;">
-                        <tr><td style="width: 50%;"><div class="field">
-                          <label for="staff_weekhours">heures/semaine</label>
-                          <div class="input-group number">
-                            <input type="number" value="" id="staff_weekhours" style="text-align: right;" class="form-control">
-
-                            <div class="input-group-addon">h</div>
-                          </div>
-                        </div></td><td style="width:50%"><div class="field" >
-                            <label for="staff_color">Couleur</label>
-                            <div class="input-group">
-                            <input type="hidden" id="staff_color" class="form-control " value="">
-                            </div>
-                        </div></td></tr>
-                        </table>
-                        <div class="field">
-                          <label for="staff_iban">Compte Bancaire</label> <input type="text" value="" id="staff_iban" class="form-control">
-                        </div>
-                        
-                        
-                        </form>
-                        
-                      </td>
-                    </tr>
-                  </tbody>
-                </table>
-              </div>
-              <div class="tabbable">
-            <ul class="nav nav-tabs" id="tabgrouphead">
-              <li><a data-toggle="tab" href="#activity">Organisation interne</a></li>
-              <li><a data-toggle="tab" href="#vacancy">Congé</a></li>
-            </ul>
-
-            <div class="tab-content">
-              
-              <div id="activity" class="tab-pane">
-                <div class="form-group form-inline">
-                      <label for="year_organisation">Année:</label>
-                      <div class="input-group">
-                        <select id="year_organisation" class="selyear">
-                          
-                        </select>
-                    </div>
-                <button onclick="dlg_event({'uuid':''},'ins');" class="btn btn-primary" type="button"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span>&nbsp;Activité</button>
-                </div>
-                 <table id="tbl_activity" class="table table-striped">
-                  
-                </table>
-              </div>
-              <div id="vacancy" class="tab-pane">
-                <div class="form-group form-inline">
-                      <label for="year_vacancy">Année:</label>
-                      <div class="input-group">
-                        <select id="year_vacancy" class="selyear">
-                          
-                        </select>
-                    </div>
-                  <button onclick="dlg_vacancy({'uuid':''},'ins');" class="btn btn-primary" type="button"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span>&nbsp;Congé</button>
-                      <div class="form-group">
-                        <label for="vacancy_total">congé normale</label>
-                        
-                        <div class="input-group" style="width: 120px;">
-                          <input type="text" id="vacancyyeartotal" class="form-control" value="" onblur="saveyearvacdays();">
-                          <span class="input-group-addon">h</span>
-                        </div>
-                        
-                      </div>
-                      <div class="form-group">
-                        <label for="vacancylastyearrest">congé à récupérer</label>
-                        
-                        <div class="input-group" style="width: 120px;">
-                          <input type="text" id="vacancylastyearrest" class="form-control" value="0" readonly="1">
-                          <span class="input-group-addon">h</span>
-                        </div>
-                        
-                      </div>
-                </div>
-              <table>
-                <tr>
-                    <td style="width: 800px; vertical-align: top;">
-                        <table id="tbl_vacancy" class="table table-striped">
-                  
-                        </table>
-                    </td>
-                    <td>
-                        <table style="width: 100%;margin-top: -50px;" class="table table-striped table-bordered">
-                            <thead>
-                                <tr><th colspan="5">Congé <span id="lblyear"></span></th></tr>
-                                <tr><th>&nbsp;</th><th>&nbsp;</th><th colspan="2">planification</th><th>&nbsp;</th></tr>
-                                <tr><th>Type</th><th>ouvert</th><th>demandé</th><th>validé</th><th>pris</th></tr>
-                            </thead>
-                            <tbody>
-                                <tr>
-                                       <td>normale</td>
-                                       <td class="alignright" id="vacnopen">&nbsp;</td>
-                                       <td class="alignright" id="vacnasked">&nbsp;</td>
-                                       <td class="alignright" id="vacnplanned">&nbsp;</td>
-                                       <td class="alignright" id="vacntaken">&nbsp;</td>
-                                </tr>
-                                <tr>
-                                       <td>exceptionelle</td>
-                                       <td class="alignright" id="vaceopen">&nbsp;</td>
-                                       <td class="alignright" id="vaceasked">&nbsp;</td>
-                                       <td class="alignright" id="vaceplanned">&nbsp;</td>
-                                       <td class="alignright" id="vacetaken">&nbsp;</td>
-                                </tr>
-                                <tr>
-                                       <td>maladie</td>
-                                       <td class="alignright" id="vacmopen">&nbsp;</td>
-                                       <td class="alignright" id="vacmasked">&nbsp;</td>
-                                       <td class="alignright" id="vacmplanned">&nbsp;</td>
-                                       <td class="alignright" id="vacmtaken">&nbsp;</td>
-                                </tr>
-                            </tbody>
-                            <tfoot>
-                                <tr>
-                                       <th>total</th>
-                                       <th class="alignright" id="vactopen">&nbsp;</th>
-                                       <td class="alignright" id="vactasked">&nbsp;</td>
-                                       <th class="alignright"  id="vactplanned">&nbsp;</th>
-                                       <th class="alignright" id="vacttaken">&nbsp;</th>
-                                </tr>
-                            </tfoot>
-                        </table>
-                    </td>
-                </tr>
-              </table>    
-              
-              <div id="vacancystatus" style=" white-space: nowrap; width: 100%; text-align: center;"></div>  
-              
-            </div>
-          </div>
-              </div>
-<!-- EVENT  DLG begin -->
-<div class="modal fade" id="edit_event">
-          <div class="modal-dialog" style="width: 800px; max-width: 800px;">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-                <h4 class="modal-title">Editer Activité</h4>
-              </div>
-              <div class="modal-body" style=" height: 550px; max-height: 550px ">
-<div id="frmeditevent">
-                  <input type="hidden" value="0" id="uuid" />
-                  <div class="form-inline row">
-                    <label for="description" class="col-md-2">Description</label>
-                    <div class="input-group form-inline col-md-10">
-                    <input type="text" value="" id="description"  class="form-control" >
-                    <span class="input-group-addon" style="height: 20px; padding-top: 1px; padding-bottom: 1px;"><input type="hidden" id="color" class="form-control " value="" style="margin-top: 0px;"></span>
-                    </div>
-                    <!--<input type="color" value="" id="color"  class="form-control col-md-8" style="width: 10%;">-->
-                  </div>
-                  <div class="form-inline row">
-                    <label for="location" class="col-md-2">Lieu</label>
-                    <input type="text" value="" id="location" class="form-control col-md-8" style="width: 80%;">
-                  </div>
-                  <div class="form-inline row">
-                    <label for="activityuuid" class="col-md-2">Personnel</label>
-                    <select value="" id="staffuuid" class="form-control col-md-8" style="width: 80%;" multiple="multiple" ></select>
-                  </div>
-                  <div class="row">
-                    <div class="form-inline">
-                  <div id="date-container">
-                    <label class="col-md-3">Dates début / fin</label>
-                    <div id="dt_datefrom" class="input-group date">
-                      <input type="date" class="form-control" value="" limits="1" placeholder="dd.mm.yyyy" id="datefrom"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                    </div>
-                    <div id="dt_dateto" class="input-group date">
-                      <input type="date" class="form-control" value="" limits="1" placeholder="dd.mm.yyyy" id="dateto"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                    </div>
-                  </div>
-                  </div>
-                  </div>
-                  <div class="row">
-                  <div class="form-inline ">
-                    <label   class="col-md-3">heures début / fin</label>
-                    <div class="input-group bootstrap-timepicker time">
-                      <input type="text" class="form-control timepicker" placeholder="" value="" id="timefrom">
-                    </div>
-                    <div class="input-group bootstrap-timepicker time">
-                      <input type="text" class="form-control timepicker" placeholder="" value="" id="timeto">
-                    </div>
-                  </div>
-                  </div>
-                  <div class="row">
-                    
-                  </div>
-                  <div class="row">
-                    <div class="panel panel-default">
-                      <div class="panel-heading">
-                        <h3 class="panel-title">Récurrence
-                        <select id="freq" onchange="setfreq();">
-                          <option value="">pas de récurrence</option>
-                          <option value="daily">quotidienne</option>
-                          <option value="weekly">hebdomaire</option>
-                          <option value="monthly">mensuelle</option>
-                        </select>
-                        </h3>
-                      </div>
-                    <div class="panel-body">
-                        <div class="row">
-                        <div class="form-inline" id="freqinterval">
-                          <label>interval: tous les</label>
-                          <input class="form-control" type="number" id="interval" style="width: 50px;" value="1"/>
-                          <label id="lblfreq"></label>
-                        </div>
-                        </div>
-                        <div class="row" id="freqweekly">
-                           <div class="form-inline">
-                            <label>jours de semaine:</label>
-                            <!--<input class="col-md-2 form-control" style="width: 50px;" type="number" id="xtimes_num" value="1"/>-->
-                            <!--<label class="col-md-2">semaines,le </label>-->
-                            <div class="btn-group form-inline" id="weekly_byday" data-toggle="buttons">
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="weekly_byday_mo" value="MO" /> Lu
-                            </label>
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="weekly_byday_tu" value="TU" /> Ma
-                            </label>
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="weekly_byday_we" value="WE" /> Me
-                            </label>
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="weekly_byday_th" value="TH" /> Je
-                            </label>
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="weekly_byday_fr" value="FR" /> Ve
-                            </label>
-                            <!--<label class="btn btn-primary">-->
-                            <!--  <input type="checkbox" id="weekly_byday_sa" value="SA" /> Sa-->
-                            <!--</label>-->
-                            <!--<label class="btn btn-primary">-->
-                            <!--  <input type="checkbox" id="weekly_byday_su" value="SU" /> Di-->
-                            <!--</label>-->
-                           </div>
-                           </div>
-                        </div>
-                        <div class="row" id="freqmonthly">
-                          <div class="form-inline">
-                            <div class="btn-group" data-toggle="buttons" id="monthly_by">
-                            <label class="btn btn-primary active">
-                              <input type="radio" id="pnl_monthly_byday" value="monthly_byday" checked="1"/> par jour de semaine
-                            </label>
-                            <label class="btn btn-primary">
-                              <input type="radio" id="pnl_monthly_bymonthday" value="monthly_bymonthday"/> par jour du mois
-                            </label>
-                            </div>
-                          </div>
-                          <div class="form-inline" id="freq_monthly_byday">
-                            <!--<label class="col-md-2">tous les</label>-->
-                            <!--<input class="col-md-2 form-control" type="number" id="xtimes_num"  style="width: 50px;" value="1"/>-->
-                            <!--<label class="col-formmd-2">mois, le </label><br/>-->
-                            <div class="btn-group" data-toggle="buttons" id="monthly_bydaypos">
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="monthly_bydaypos_1" value="1" /> 1ier
-                            </label>
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="monthly_bydaypos_2" value="2" /> 2ième
-                            </label>
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="monthly_bydaypos_3" value="3" /> 3ième
-                            </label>
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="monthly_bydaypos_4" value="4" /> 4ième
-                            </label>
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="monthly_bydaypos_5" value="5" /> 5ième
-                            </label>
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="monthly_bydayppos_last-1" value="-1" /> dernier
-                            </label>
-                          </div>
-                            <br/>
-                            <div class="btn-group" data-toggle="buttons" id="monthly_bydaywday">
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="monthly_bydaywday_mo" value="MO" /> Lu
-                            </label>
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="monthly_bydaywday_tu" value="TU" /> Ma
-                            </label>
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="monthly_bydaywday_we" value="WE" /> Me
-                            </label>
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="monthly_bydaywday_th" value="TH" /> Je
-                            </label>
-                            <label class="btn btn-primary">
-                              <input type="checkbox" id="monthly_bydaywday_fr" value="FR" /> Ve
-                            </label>
-                            <!--<label class="btn btn-primary">-->
-                            <!--  <input type="checkbox" id="monthly_bydaywday_sa" value="SA" /> Sa-->
-                            <!--</label>-->
-                            <!--<label class="btn btn-primary">-->
-                            <!--  <input type="checkbox" id="monthly_bydaywday_su" value="SU" /> Di-->
-                            <!--</label>-->
-                           </div>
-                            </div>
-                           <div class="form-inline" id="freq_monthly_bymonthday">
-                            <div class="btn-group" data-toggle="buttons" id="monthly_bymonthday">
-                            <label class="btn btn-primary" style="width: 40px; border-radius: 0px;">
-                              <input type="checkbox" id="monthly_bymonthday_1" value="1" />1
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_2" value="2" />2
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_3" value="3" />3
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_4" value="4" />4
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_5" value="5" />5
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_6" value="6" />6
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_7" value="7" />7
-                            </label>                      
-                            <br/>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_8" value="8" />8
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_9" value="9" />9
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_10" value="10" /> 10
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_11" value="11" /> 11
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_12" value="12" /> 12
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_13" value="13" /> 13
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_14" value="14" /> 14
-                            </label>
-                           
-                            <br/>
-                            
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_15" value="15" /> 15
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_16" value="16" /> 16
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_17" value="17" /> 17
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_18" value="18" /> 18
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_19" value="19" /> 19
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_20" value="20" /> 20
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_21" value="21" /> 21
-                            </label>
-                           
-                            <br/>
-                            
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_22" value="22" /> 22
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_23" value="23" /> 23
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_24" value="24" /> 24
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_25" value="25" /> 25
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_26" value="26" /> 26
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_27" value="27" /> 27
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_28" value="28" /> 28
-                            </label>
-                           
-                            <br/>
-                            
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_29" value="29" /> 29
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_31" value="31" /> 30
-                            </label>
-                            <label class="btn btn-primary" style="width: 40px;">
-                              <input type="checkbox" id="monthly_bymonthday_31" value="31" /> 31
-                            </label>
-                            <label class="btn btn-primary" style="width: 157px;" >
-                              <input type="checkbox" id="monthly_bymonthday_-1" value="-1" /> dernier
-                            </label>
-                            
-                            <br/>
-                            <label class="btn btn-primary" style="width: 138px;">
-                              <input type="checkbox" id="monthly_bymonthday_-2" value="-2" /> av.-dernier
-                            </label>
-                            <label class="btn btn-primary" style="width: 138px; border-radius: 0px;">
-                              <input type="checkbox" id="monthly_bymonthday_-3" value="-3" /> av.-av.-dernier
-                            </label>
-                           </div>
-                            
-                          </div>
-                          
-                          
-                          
-                          <br/>
-                          
-                        </div>
-                    </div>
-                    
-                  </div>
-                  </div>
-</div>
-                </div>
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" id="btndeleteevent" onclick="confirm_delete_event();" class="btn">Supprimer</button>
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Annuler</button> <button onclick="save_event();" id="btn_save_event" class="btn btn-primary">Accepter</button>
-              </div>
-              </div>
-            </div>
-          </div>
-        <div class="modal fade" id="confirm_delete_event">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-
-                <h4 class="modal-title">Supprimer Activité</h4>
-              </div><!-- dialog contents -->
-
-              <div class="modal-body">
-                Êtes vous sûre de supprimer cette Activité?<br>
-                
-              </div><!-- dialog buttons -->
-
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Non</button> <button onclick="delete_event();" class="btn btn-primary">Oui</button>
-              </div>
-            </div>
-          </div>
-        </div>
-<!-- EVENT DLG end -->
-        <div class="modal fade" id="edit_vacancy">
-          <div class="modal-dialog" style="width: 800px; max-width: 800px;">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-                <h4 class="modal-title">Editer Congé</h4>
-              </div>
-              <div class="modal-body" style="height: 410px; max-height: 410px; ">
-<div id="frmeditvacancy">
-                  <input type="hidden" value="0" id="uuid" />
-                  <input type="hidden" value="" id="staffuuid" />
-                  <!--<div class="form-inline row">-->
-                  <!--  <label for="location" class="col-md-2">Lieu</label>-->
-                  <!--  <input type="text" value="" id="location"  nullable="true" class="form-control col-md-8" style="width: 80%;">-->
-                  <!--</div>-->
-                  
-                  <div class="form-inline row">
-                    <label for="dailyduration" class="col-md-3">Journée</label>
-                    <select value="" id="dailyduration"  class="form-control" onchange="setdailydurationfields();">
-                      <option value="1.0">Journée(s) complet(s)</option>
-                      <option value="0.4">demi(s) Journée(s)</option>
-                      <option value="0.">quelques heures</option>
-                    </select>
-                  </div>
-                  
-                    <div class="row form-inline">
-                    <label class="col-md-3">Date début</label>
-                    <div id="dt_vacdatefrom" class="input-group date">
-                      <input type="date" class="form-control" value="" limits="1" placeholder="dd.mm.yyyy" id="vacdatefrom"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                    </div>
-                  </div>
-                  <div class="row form-inline">
-                    <label class="col-md-3">Date fin</label>
-                    <div id="dt_vacdateto" class="input-group date">
-                      <input type="date" class="form-control" value="" limits="1" placeholder="dd.mm.yyyy" id="vacdateto"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                    </div>
-                  </div>
-                  
-                  <div id="ftimefrom" class="row form-inline">
-                  
-                    <label   class="col-md-3">heure début</label>
-                    <div class="input-group bootstrap-timepicker time">
-                      <input type="text" class="form-control timepicker" placeholder="" value="" id="timefrom">
-                    </div>
-                  </div>
-                  <div class="form-inline row" id="fhours">
-                    <label for="description" class="col-md-3">nbr. d'heures</label>
-                    <input type="text" value="" id="hours"  nullable="true" class="form-control col-md-6" style="width: 20%;">
-                               
-                  </div>
-                  
-                  <div class="form-inline row">
-                    <label for="type" class="col-md-3">Type de congé</label>
-                    <select id="type" value="">
-                      <option value="0">Congé normal</option>
-                      <option value="1">Congé expetionelle</option> 
-                      <option value="-1">Congé de maladie</option>
-                    </select>          
-                  </div>
-                  <div class="form-inline row">
-                    <label for="description" class="col-md-3">Description</label>
-                    <input type="text" value="" id="description"  nullable="true" class="form-control col-md-6" style="width: 70%;">
-    
-                  </div>
-                  <div class="row" style="height: 120px;"></div>
-                </div>
-              </div>
-              <div class="modal-footer">
-                <button aria-hidden="true" onclick="accept_vacancy();" data-dismiss="modal" id="btnacceptvacancy" class="btn">Valider Congé</button>
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Annuler</button>
-                <button onclick="save_vacancy();" class="btn btn-primary">Accepter</button>
-              </div>
-              </div>
-            </div>
-          </div>
-          <div class="modal fade" id="confirm_delete_vacancy">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-
-                <h4 class="modal-title">Supprimer Congé</h4>
-              </div><!-- dialog contents -->
-
-              <div class="modal-body">
-                Êtes vous sûre de supprimer ce congé?<br>
-                
-              </div><!-- dialog buttons -->
-
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Non</button> <button onclick="delete_vacancy();" class="btn btn-primary">Oui</button>
-              </div>
-            </div>
-          </div>
-        
-        
-      </div>
-  <script src="../../web/js/jquery.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap.min.js" type="text/javascript"></script>
-  <script src="../../web/js/datatables.min.js" type="text/javascript"></script>
-  <script src="../../web/js/moment-with-locales.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-datetimepicker.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-timepicker.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-multiselect.js" type="text/javascript"></script>
-  <script src="../../web/js/jquery.minicolors.min.js" type="text/javascript"></script>
-  <script src="../calendar/js/rrule.js" type="text/javascript"></script>
-  <script src="../calendar/js/nlp.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/navigation.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/preferences.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/database.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/system.js" type="text/javascript"></script>
-  <script src="../../web/js/creorga.js" type="text/javascript"></script>
-  <script src="../../web/js/labels.js" type="text/javascript"></script>
-  <script src="js/coworker.js" type="text/javascript"></script>
-</body>
-</html>
diff --git a/app_v3/chrome/content/modules/support/backup.html b/app_v3/chrome/content/modules/support/backup.html
deleted file mode 100644 (file)
index ea7e186..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-  <meta charset="utf-8">
-
-  <title>Creorga - Backup</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta http-equiv="cache-control" content="max-age=0" />
-  <meta http-equiv="cache-control" content="no-cache" />
-  <meta http-equiv="expires" content="0" />
-  <meta http-equiv="expires" content="Tue, 01 Jan 1970 1:00:00 GMT" />
-  <meta http-equiv="pragma" content="no-cache" />
-  <link href="../../web/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-  <!--<link href="../../web/css/bootstrap-theme.min.css" rel="stylesheet" type="text/css">-->
-  <link href="../../web/css/datatables.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/dataTables.bootstrap.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-datetimepicker.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-timepicker.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/glyphicons.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/style.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/creorga.css" rel="stylesheet" type="text/css">
-  </head>
-  <body>
-    
-     <div id="app">
-   <div class="container-fluid" style="margin-top: 5px;">
-    <!--<div id="main" class="main"><h2>Sauvegardes</h2>-->
-    <!--<button onclick="create_backup();" class="btn btn-default"><span class="glyphicon glyphicon-floppy-disk" aria-hidden="true"></span>&nbsp;<span class="glyphicon glyphicon-plus" aria-hidden="true"></span>&nbsp;sauvegarde</button>-->
-    <!--<button onclick="export_data();" class="btn btn-default"><span class="glyphicons glyphicons-disk-export" aria-hidden="true"></span>&nbsp;exporter</button>-->
-    <!--<button onclick="import_data();" class="btn btn-default"><span class="glyphicons glyphicons-disk-import" aria-hidden="true"></span>&nbsp;importer</button>-->
-    
-    <table class="display dataTable" width="100%" style="width: 100%;" id="tbl_backup" role="grid"></table>
-    
-    <div class="modal fade" id="confirm_restore_data">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-
-                <h4 class="modal-title">Restaurer une sauvegarde</h4>
-              </div><!-- dialog contents -->
-
-              <div class="modal-body">
-                Êtes vous sûre de restaurer cette sauvegarde?<br>
-                <span style="font-weight: bold">Tous les données que vous avez ajoutées / modifiées depuis cette sauvegarde vents disparaître! Les autres sauvgardes restent inchangées!</span>
-              </div><!-- dialog buttons -->
-
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Non</button> <button onclick="restore_data();" class="btn btn-default">Oui</button>
-              </div>
-            </div>
-          </div>
-        </div>
-    </div></div></div>
-     
-    
-  <script src="../../web/js/jquery.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap.min.js" type="text/javascript"></script>
-  <script src="../../web/js/datatables.min.js" type="text/javascript"></script>
-  <script src="../../web/js/moment-with-locales.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-datetimepicker.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-timepicker.min.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/preferences.js" type="text/javascript"></script>
-    <script src="chrome://creorga/content/js/navigation.js" type="text/javascript"></script>
-    <script src="chrome://creorga/content/js/database.js" type="text/javascript"></script>
-    <script src="chrome://creorga/content/js/system.js" type="text/javascript"></script>
-    <script src="chrome://creorga/content/js/tools.js" type="text/javascript"></script>
-      
-      <script src="../../web/js/labels.js" type="text/javascript"></script>
-    <script src="js/backup.js" type="text/javascript"></script>
-    <script src="../../web/js/creorga.js" type="text/javascript"></script>
-    
-  </body>
-</html>
\ 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 (file)
index 5906e60..0000000
+++ /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("<thead><th>restaurer</th><th>date du backup</th></thead>");
-  var tbody = "<tbody>";
-  var bdata = new Array();
-  for (var f in files){
-    bdata.push(files[f].path);
-  }
-  bdata = bdata.reverse();
-  for (var i=0;i<bdata.length;i++){
-    var fname = system.getFileName(bdata[i]);
-    var mixdata = fname.split("_");
-    var cfname = mixdata[2];
-    if(mixdata[1] == curcfg.uuid){
-      var dstr = cfname.substring(0,4) + '-' + cfname.substring(4,6) + '-' + cfname.substring(6,8) ;//+ 'T' + fname.substring(17,19) + ':'+fname.substring(19,21) + ':'+fname.substring(21,23); 
-      //dump(dstr + "\n");
-      var cdate = new Date(dstr);
-      tbody += '<tr><td style="width: 200px;">';
-      //tbody += '<button onclick="backup_save(\''+ fname +'\');" class="btn btn-primary"><span class="glyphicon glyphicon-floppy-save" aria-hidden="true"></span></button>'; 
-      tbody += '<button onclick="backup_restore(\''+ fname +'\');" class="btn btn-primary"><span class="glyphicon glyphicon-transfer" aria-hidden="true"></span></button>';
-
-      tbody += "</td>";
-      tbody += "<td>" + cdate.toLocaleFormat("%d.%m.%Y") + "</td>";
-      tbody += "</tr>"; 
-    }
-  }
-  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
index 3ce71d7..cf70271 100644 (file)
@@ -28,7 +28,7 @@
    <button onclick="save_multisite();" class="btn btn-primary" type="button" id="btnnewsite"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span>&nbsp; nouveau site</button>
    <button onclick="dlg_addsite();" class="btn btn-primary" type="button" id="btnremotesite"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span>&nbsp; site existant (partagé)</button>
    <button onclick="dlg_vpn();" class="btn btn-primary" type="button" id="btnvpnconfig" style="display: none;"><span class="glyphicons glyphicons-unlock" aria-hidden="true"></span>&nbsp; Configuration VPN</button>
-   <button onclick="checkdatabases();" class="btn btn-info" type="button" id="btncheckdb" style="display: none;"><span class="glyphicon glyphicon-reload" aria-hidden="true"></span>&nbsp; verification DB</button>
+   <!-- <button onclick="checkdatabases();" class="btn btn-info" type="button" id="btncheckdb" style="display: none;"><span class="glyphicon glyphicon-reload" aria-hidden="true"></span>&nbsp; verification DB</button> -->
    <button onclick="vpnconnection();" class="btn btn-warning" type="button" id="btnvpnconnection" style="display: none;"><span class="glyphicons glyphicons-database-lock" aria-hidden="true"></span>&nbsp; Connecter VPN</button>
    <!-- <button onclick="dlg_sync();" class="btn btn-primary" type="button" id="btnsyncconfig" style="display: none;"><span class="glyphicons glyphicons-reload" aria-hidden="true"></span>&nbsp; Configuration de Synchronisation</button>
    <button onclick="syncstart();" class="btn btn-warning" type="button" id="btnsyncstart" style="display: none;"><span class="glyphicons glyphicons-upload" aria-hidden="true"></span>&nbsp; Activer Synchronisation</button>
diff --git a/app_v3/chrome/content/modules/support/multisite_basic.html b/app_v3/chrome/content/modules/support/multisite_basic.html
deleted file mode 100644 (file)
index fcb8c33..0000000
+++ /dev/null
@@ -1,185 +0,0 @@
-<!DOCTYPE html>
-
-<html lang="fr">
-<head>
-  <meta charset="utf-8">
-  <title>Creorga - Configuration Site</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta http-equiv="cache-control" content="max-age=0" />
-  <meta http-equiv="cache-control" content="no-cache" />
-  <meta http-equiv="expires" content="0" />
-  <meta http-equiv="expires" content="Tue, 01 Jan 1970 1:00:00 GMT" />
-  <meta http-equiv="pragma" content="no-cache" />
-  <link href="../../web/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-  <!--<link href="../../web/css/bootstrap-theme.min.css" rel="stylesheet" type="text/css">-->
-  <link href="../../web/css/datatables.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/dataTables.bootstrap.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-datetimepicker.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/bootstrap-timepicker.min.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/glyphicons.css" rel="stylesheet" type="text/css">
-  <link href="../../web/css/creorga.css" rel="stylesheet" type="text/css"><!-- Fav and touch icons -->
-</head>
-
-<body>
-
-   <div class="container-fluid">
-<!--   <h2>Configuration Sites</h2>-->
-<br/>
-   <button onclick="save_multisite();" class="btn btn-primary" type="button" id="btnnewsite"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span>&nbsp; nouveau site</button>
-   <button onclick="dlg_addsite();" class="btn btn-primary" type="button" id="btnremotesite"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span>&nbsp; site existant (partagé)</button>
-   <button onclick="dlg_vpn();" class="btn btn-primary" type="button" id="btnvpnconfig" style="display: none;"><span class="glyphicons glyphicons-unlock" aria-hidden="true"></span>&nbsp; Configuration VPN</button>
-   <button onclick="vpnconnection();" class="btn btn-warning" type="button" id="btnvpnconnection" style="display: none;"><span class="glyphicons glyphicons-database-lock" aria-hidden="true"></span>&nbsp; Connecter VPN</button>
-      <table class="display dataTable" width="100%" style="width: 100%;" id="tbl_multisite" role="grid"></table>
-</div>
-   <div class="modal fade" id="dlg_movesite">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-                <h4 class="modal-title">Délocaliser Site</h4>
-              </div>
-              <div class="modal-body">
-                <div id="frmeditmultisite">
-                  <input type="hidden" value="0" id="uuid" />
-                  <input type="hidden" value="" id="oldfolder" />
-                  <input type="hidden" value="" id="dbnum" />
-                  <div class="form-group form-inline">
-                    <label for="name">ID Globale</label>
-                    <input type="text" value="" id="gluuid"  nullable="true" style="width: 70%;" class="form-control">
-                  </div>
-                  <div class="form-group" id="sharedfolderdata">
-                    <label for="name">Dossier des données</label>
-                    <div class="form-inline">
-                    <input type="text" class="form-control" id="sharedfolder" style="width: 70%;" readonly="true">
-                    <button class="btn btn-primary" onclick="getremotefolder();">Choisir le dossier...</button>
-                    </div>
-                    <div>
-                      
-                    </div>
-                  </div>
-
-                  
-                </div>
-                </div>
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Annuler</button> <button onclick="save_remotesite();" class="btn btn-primary">OK</button>
-              </div>
-              
-            </div>
-          </div>
-        </div>
-        <div class="modal fade" id="dlg_addsite">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-                <h4 class="modal-title">Ajouter Site partagé</h4>
-              </div>
-              <div class="modal-body">
-                <div id="frmeditnewsite">
-                  
-                  <div class="form-group" id="sharedfiledata">
-                    <label for="name">Dossier des données</label>
-                    <div class="form-inline">
-                    <input type="text" class="form-control" id="sharedfile" style="width: 70%;" readonly="true">
-                    <button class="btn btn-primary" onclick="getremotefile();">Choisir la base de donnée</button>
-                    </div>
-                    <div>
-                      
-                    </div>
-                  </div>
-                  
-                  
-                </div>
-                </div>
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Annuler</button> <button onclick="add_remotesite();" class="btn btn-primary">OK</button>
-              </div>
-              
-            </div>
-          </div>
-        </div>
-        <div class="modal fade" id="confirm_delete_multisite">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-
-                <h4 class="modal-title">Supprimer Crèche</h4>
-              </div>
-
-              <div class="modal-body">
-                Êtes vous sûre de supprimer cette crèche?<br/>
-              </div>
-
-              <div class="modal-footer">
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Non</button> <button onclick="delete_multisite();" class="btn btn-primary">Oui</button>
-              </div>
-            </div>
-          </div>
-        </div>
-        <!-- VPN Config -->
-        <div class="modal fade" id="dlg_vpnconfig">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span><span class="sr-only">Close</span></button>
-                <h4 class="modal-title">Configuration VPN</h4>
-              </div>
-              <div class="modal-body">
-                <div id="frmeditvpn">
-                  
-                  <div class="form-group">
-                    <label for="vpnhost">VPN Connection User@Host:Port</label>
-                    <input type="text" class="form-control" id="vpnhost">
-                  </div>
-                  <div class="form-group">
-                    <label for="vpnkeyfile">VPN Fichier clé privé (*.key)</label>
-                    <div class="form-inline">
-                    <input type="text" class="form-control" id="vpnkeyfile" style="width: 70%;" readonly="true">
-                    <button class="btn btn-primary" onclick="getvpnfile();">Choisir...</button>
-                    </div>
-                  <div>
-                  <div class="form-group">
-                    <label for="smbuser">Utilisateur</label>
-                    <input type="text" class="form-control" id="smbuser">
-                  </div>
-                  <div class="form-group">
-                    <label for="smbpassword">Mot de passe</label>
-                    <input type="password" class="form-control" id="smbpassword">
-                  </div>
-                         <div class="form-group">
-                    <label for="smbsharedfolder">Dossier partagé</label>
-                    <input type="text" class="form-control" id="smbsharedfolder">
-                  </div>    
-                    </div>
-                  </div>
-                </div>
-                </div>
-              <div class="modal-footer">
-               <button onclick="remove_vpnconfig();" class="btn btn-primary">Supprimer Configuration</button>
-                <button aria-hidden="true" data-dismiss="modal" class="btn">Annuler</button> 
-                <button onclick="save_vpnconfig();" class="btn btn-primary">OK</button>
-              </div>
-              
-            </div>
-          </div>
-        </div>
-      
-  <script src="../../web/js/jquery.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap.min.js" type="text/javascript"></script>
-  <script src="../../web/js/datatables.min.js" type="text/javascript"></script>
-  <script src="../../web/js/moment-with-locales.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-datetimepicker.min.js" type="text/javascript"></script>
-  <script src="../../web/js/bootstrap-timepicker.min.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/navigation.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/system.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/preferences.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/database.js" type="text/javascript"></script>
-  <script src="chrome://creorga/content/js/tools.js" type="text/javascript"></script>
-  <script src="../../web/js/labels.js" type="text/javascript"></script>
-  <script src="js/multisite.js" type="text/javascript"></script>
-  <script src="../../web/js/creorga.js" type="text/javascript"></script>
-  
-</body>
-</html>
\ No newline at end of file
index 48a88e2..9e3a3ec 100644 (file)
@@ -4,8 +4,7 @@
 <overlay id="ov_support" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
 <menupopup id="pophelp">
   <menuseparator insertafter="mnuabout" id="mnuspoortsep"/>
-  <menuitem label="mise à jour..." insertafter="mnuupdate" oncommand="navigation.load_appview('update','support',null,'mise à jours');"  id="mnuupdate"/>
-  <menuitem label="Sauvegardes" insertafter="mnuspoortsep" oncommand="navigation.load_appview('backup','support',null,'Sauvgardes');" id="mnubackup" />
+  <!--<menuitem label="mise à jour..." insertafter="mnuupdate" oncommand="navigation.load_appview('update','support',null,'mise à jours');"  id="mnuupdate"/>-->
   <menuitem label="Configuration Sites" insertafter="mnubackup" oncommand="navigation.load_appview('multisite','support',null,'Configuration Sites');"  id="mnumultisiteconfig"/>
   
 </menupopup>
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 (file)
index 381c018..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE overlay PUBLIC "-//MOZILLA//DTD XUL V1.0//EN"
-"http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<overlay id="ov_support" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-<menupopup id="pophelp">
-  <menuseparator insertafter="mnuabout" id="mnuspoortsep"/>
-  <menuitem label="mise à jour..." insertafter="mnuupdate" oncommand="navigation.load_appview('update','support',null,'mise à jours');"  id="mnuupdate"/>
-  <menuitem label="Configuration Sites" insertafter="mnubackup" oncommand="navigation.load_appview('multisite_basic','support',null,'Configuration Sites');"  id="mnumultisiteconfig"/>
-</menupopup>
-
-</overlay>
\ 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 (file)
index 2bf1152..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE overlay PUBLIC "-//MOZILLA//DTD XUL V1.0//EN"
-"http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<overlay id="ov_support" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-<menupopup id="pophelp">
-  <menuseparator insertafter="mnuabout" id="mnuspoortsep"/>
-</menupopup>
-
-</overlay>
\ No newline at end of file