update and others

diff --git a/app_v3/chrome/content/js/license.js b/app_v3/chrome/content/js/license.js
index 863146f..6ccbe59 100644 (file)
--- a/app_v3/chrome/content/js/license.js
+++ b/app_v3/chrome/content/js/license.js
@@ -58,7 +58,7 @@ var license = {
        var data = null;
        
         var appinfo = system.b64EncodeUnicode(JSON.stringify(system.appinfo()));
-        dump(this.url + '?lic=' + lickey + ';appinfo=' + appinfo +"\n !!!!!\n");
+        //dump(this.url + '?lic=' + lickey + ';appinfo=' + appinfo +"\n !!!!!\n");
         NetUtil.asyncFetch(this.url + '?lic=' + lickey + ';appinfo=' + appinfo, function(inputStream, status) {
           
           if (!Components.isSuccessCode(status)) {
@@ -68,7 +68,7 @@ var license = {
           } else {
             var strdata = NetUtil.readInputStreamToString(inputStream, inputStream.available());
            
-            dump("Data returned:" + strdata + "\n");
+            //dump("Data returned:" + strdata + "\n");
             try {
                data = JSON.parse(strdata);
             } catch(e){

diff --git a/app_v3/chrome/content/js/system.js b/app_v3/chrome/content/js/system.js
index fee41f3..4c37839 100644 (file)
--- a/app_v3/chrome/content/js/system.js
+++ b/app_v3/chrome/content/js/system.js
@@ -1,14 +1,15 @@
 //Source-code licensed under EUPL v1.1 ( Copyright 2016 By DKS s.à r.l. - Kilian Saffran - Luxembourg ) 
-function jsdump(str) {
-  Components.classes['@mozilla.org/consoleservice;1']
-            .getService(Components.interfaces.nsIConsoleService)
-            .logStringMessage(str);
-}
+// function jsdump(str) {
+//   Components.classes['@mozilla.org/consoleservice;1']
+//             .getService(Components.interfaces.nsIConsoleService)
+//             .logStringMessage(str);
+// }
 
 Components.utils["import"]("resource://gre/modules/FileUtils.jsm");
 Components.utils["import"]("resource://gre/modules/Services.jsm");
 Components.utils["import"]("resource://gre/modules/NetUtil.jsm");
 Components.utils["import"]("resource://gre/modules/osfile.jsm");
+Components.utils["import"]("resource://gre/modules/Downloads.jsm");
 var system = {
   os: Components.classes["@mozilla.org/xre/app-info;1"].getService(Components.interfaces.nsIXULRuntime).OS,
   sep: function() {

diff --git a/app_v3/chrome/content/modules/accounting/js/accounting.js b/app_v3/chrome/content/modules/accounting/js/accounting.js
index 337d3ec..510fe2f 100644 (file)
--- a/app_v3/chrome/content/modules/accounting/js/accounting.js
+++ b/app_v3/chrome/content/modules/accounting/js/accounting.js
@@ -439,7 +439,7 @@ function dlg_accounting(childuuid,xref){
   //alert("TEST");
   var acc1sql = "SELECT acc.accmonth,ch.uuid as childuuid,COALESCE( ch.prename, '' ) || ' ' || COALESCE( ch.surname, '' ) || '(' || ch.checkservicenumber || ')' AS childname,case when acc.invoicedate is not null then strftime('%d.%m.%Y',acc.invoicedate) else null end as invoicedate, case when acc.payeddate is not null then strftime('%d.%m.%Y',acc.payeddate) else null end as payeddate, payedamount, invoiceamount,benefitamount, replace(acc.reference,'NOCHECKSERVICE:','') as reference, instr(acc.reference,'NOCHECKSERVICE:') as ischeckservice, case when acc.reminderdate1 is not null then strftime('%d.%m.%Y',acc.reminderdate1) else null end as reminderdate1, case when acc.reminderdate2 is not null then strftime('%d.%m.%Y',acc.reminderdate2) else null end as reminderdate2, case when acc.reminderdate3 is not null then strftime('%d.%m.%Y',acc.reminderdate3) else null end as reminderdate3, case when acc.invoicefile is not null and acc.invoicefile != '' then '"+ importpath.path + system.sep() +"' || acc.invoicefile else null end as invoicefile,'upd' as action FROM accounting acc join childs ch on (ch.uuid=acc.childuuid) where acc.accmonth = '"+ initdate.toLocaleFormat('%Y-%m-%d')+"' and acc.childuuid='"+childuuid+"' and acc.reference='"+ xref +"';";
  
-  jsdump(acc1sql);
+  //jsdump(acc1sql);
   var acc1data = appdb.dbquery(acc1sql);
   
   if (!acc1data.sqldata) {

diff --git a/app_v3/chrome/content/modules/calendar/js/calactivity.js b/app_v3/chrome/content/modules/calendar/js/calactivity.js
index 6e9994d..a1be271 100644 (file)
--- a/app_v3/chrome/content/modules/calendar/js/calactivity.js
+++ b/app_v3/chrome/content/modules/calendar/js/calactivity.js
@@ -321,7 +321,7 @@ function load_timetable() {
   }
   var cspan = 0;
   var hdays = get_vacancydays();
-  jsdump(JSON.stringify(hdays));
+  //(JSON.stringify(hdays));
   var strhead = '<thead><tr><th style="width: 120px;min-width: 120px;">Semaine</th>';
   for (var w in weekrange){
     strhead += '<th colspan="'+ weekrange[w] +'">' + w + '</th>';
@@ -1046,8 +1046,8 @@ if (wh.length > 0) {
   actsql += " WHERE " + wh.join( " OR "); 
 }
 actsql += " GROUP BY dd.daydate,ev.uuid ORDER BY ev.description,dd.daydate,ev.timefrom,ev.timeto; ";
-jsdump("STAFF ACTIVITY");
-jsdump(actsql);
+//jsdump("STAFF ACTIVITY");
+//jsdump(actsql);
 //dump("\n\n\nSTAFF ACTIVITY: " + actsql + "\n\n\n");
   var actdata = appdb.dbquery(actsql);
   actdata = actdata.sqldata;
@@ -1089,8 +1089,8 @@ function get_vacancydays(){
 "join ( "+ drsql +") dd  "+
 "on (dd.daydate between vc.vacancydate and vc.vacancydateto) group by dd.daydate order by daydate;";
   var hdata = appdb.dbquery(sql);
-  jsdump("vacancydays");
-  jsdump(sql);
+  //jsdump("vacancydays");
+  //jsdump(sql);
   hdata = hdata.sqldata;
   var hs = {};
   for (var h in hdata){

diff --git a/app_v3/chrome/content/modules/calendar/js/calvacancy.js b/app_v3/chrome/content/modules/calendar/js/calvacancy.js
index d2c2830..564bf7f 100644 (file)
--- a/app_v3/chrome/content/modules/calendar/js/calvacancy.js
+++ b/app_v3/chrome/content/modules/calendar/js/calvacancy.js
@@ -144,8 +144,8 @@ function load_calendar_data() {
   var where = "";
 
   var sql = getmonthlysql(new Date(initdate.toLocaleFormat("%Y-%m-%d")),new Date(lastmonthday.toLocaleFormat("%Y-%m-%d")),where);
-  jsdump("monthlysql");
-  jsdump(sql);
+  //jsdump("monthlysql");
+  //jsdump(sql);
   $("#tbl_timetable").html("");
   
 
@@ -607,8 +607,8 @@ function onselcreche(){
                "join ( "+ drsql +") dd  "+
                "on (dd.daydate between vc.vacancydate and vc.vacancydateto) group by dd.daydate order by daydate;";
       var hdata = appdb.dbquery(sql);
-      jsdump("Vacancy SQL");
-      jsdump(sql);
+      //jsdump("Vacancy SQL");
+      //jsdump(sql);
                  hdata = hdata.sqldata;
                  var hs = {};
                  for (var h in hdata){

diff --git a/app_v3/chrome/content/modules/support/js/update.js b/app_v3/chrome/content/modules/support/js/update.js
index 508135b..7e13a0f 100644 (file)
--- a/app_v3/chrome/content/modules/support/js/update.js
+++ b/app_v3/chrome/content/modules/support/js/update.js
@@ -4,23 +4,27 @@ function initdata(){
   var lic = apppref.getpreference("support.license");
   var appdata = system.appinfo(); 
   var data = {};
-  NetUtil.asyncFetch("http://ww.dks.lu/creorga/update.cgi?lic=" + lic + "&appid=" +appdata.ID, function(inputStream, status) {
-          
+  //alert("Init X");
+  //dump("http://www.dks.lu/creorga/update.cgi?lic=" + lic + "&appid=" +appdata.ID);
+  
+  NetUtil.asyncFetch("http://www.dks.lu/creorga/update.cgi?lic=" + lic + "&appid=" +appdata.ID, function(inputStream, status) {
+    //alert("Test.x");
     if (!Components.isSuccessCode(status)) {
       document.getElementById("updmsg").value="Impossible de verifier!";
     } else {
       var strdata = NetUtil.readInputStreamToString(inputStream, inputStream.available());
-     
-      jsdump("Data returned:" + strdata + "\n");
+      //dump("Update data returned!\n: " + JSON.stringify(strdata) + "\n");
+      //jsdump("Data returned:" + strdata + "\n");
       try {
         data = JSON.parse(strdata);
         
       } catch(e){
         document.getElementById("updmsg").value="Impossible de verifier!";
 
-        jsdump(e.message);
+        //jsdump(e.message);
         return data;
       }
+      //alert(JSON.stringify(data));
       dldmsg(data);
       
 
@@ -33,10 +37,11 @@ function initdata(){
 }
 
 function dldmsg(data){
+  //dump("Data for message: \n: " + JSON.stringify(data) + "\n");
   if (!data.update){
-    $("#updmsg").html("<strong>pas de mise-à-jour disponible</strong>");
+    $("#updmsg").html(JSON.stringify(data) + " <strong>pas de mise-à-jour disponible</strong>");
   } else {
-    $("#updmsg").html("<strong>Nouvelle Version disponible!</strong><br/><a class=\"btn btn-primary\" onclick=\"dldupdate('"+ data.update+"');\">clicker ici pour installer la mise à jour</a>");
+    $("#updmsg").html(JSON.stringify(data) + " <strong>Nouvelle Version disponible!</strong><br/><a class=\"btn btn-primary\" onclick=\"dldupdate('"+ data.update+"');\">clicker ici pour installer la mise à jour</a>");
   }
   //alert("TEST");
   

diff --git a/app_v3/chrome/content/web/js/child.js b/app_v3/chrome/content/web/js/child.js
index 523383e..3330e8d 100644 (file)
--- a/app_v3/chrome/content/web/js/child.js
+++ b/app_v3/chrome/content/web/js/child.js
@@ -213,7 +213,7 @@ function load_table_refperson() {
     var row = refpersondata.sqldata[i];
     var tr = '<tr>';
     for (var x in row){
-      jsdump(x);
+      //jsdump(x);
       if (x == 7){
         tr += "<td>"+ htmlUnescape(row[x])+"</td>";
       } else {
@@ -918,7 +918,7 @@ function save_file(){
 }
 
 function loadplantemplates(plarows){
-  jsdump("plarows:" + plarows);
+  //jsdump("plarows:" + plarows);
   var xdata = appdb.dbquery("select uuid,templatename from planningtemplate order by templatename;");
   xdata = xdata.sqldata;
   if (xdata.length > 0){

diff --git a/install/windows/creorga_update_localmanager.iss b/install/windows/creorga_update_localmanager.iss
index 9ffe914..e5dc2d9 100644 (file)
--- a/install/windows/creorga_update_localmanager.iss
+++ b/install/windows/creorga_update_localmanager.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Creorga"
-#define MyAppPublisher "DKS s.à r.l."
+#define MyAppPublisher "DKS s.� r.l."
 #define MyAppURL "http://www.dks.lu/products/creorga.html"
 #define MyAppExeName "Creorga.exe"
 
@@ -28,7 +28,7 @@ DefaultGroupName={#MyAppName}
 ;LicenseFile=C:\Users\ksaff\Release\tag\License.txt
 OutputDir=C:\Users\ksaff\Release
 
-OutputBaseFilename=Update_Creorga_{#MyAppVersion}_director
+OutputBaseFilename=Update_Creorga_{#MyAppVersion}_localmanager
 SetupIconFile=C:\Users\ksaff\Release\tag\app_v3\chrome\icons\default\winmain.ico
 Compression=lzma
 SolidCompression=yes
@@ -41,11 +41,11 @@ CloseApplications=force
 Uninstallable = no
 
 [Messages]
-SetupAppTitle=mise-à-jour {#MyAppName}
-SetupWindowTitle=mise-à-jour {#MyAppName} {#MyAppVersion}
-WizardReady=Installation de la mise-à-jour vers la version {#MyAppVersion}
-ReadyLabel1=L''assistant dispose à présent de toutes les informations pour installer la mise-à-jour de [name] sur votre ordinateur.
-ReadyLabel2b=Cliquez sur Installer pour procéder la mise-à-jour.
+SetupAppTitle=mise-�-jour {#MyAppName}
+SetupWindowTitle=mise-�-jour {#MyAppName} {#MyAppVersion}
+WizardReady=Installation de la mise-�-jour vers la version {#MyAppVersion}
+ReadyLabel1=L''assistant dispose � pr�sent de toutes les informations pour installer la mise-�-jour de [name] sur votre ordinateur.
+ReadyLabel2b=Cliquez sur Installer pour proc�der la mise-�-jour.
 
 [Languages]
 Name: "french"; MessagesFile: "compiler:Languages\French.isl"

diff --git a/install/windows/creorga_update_staff.iss b/install/windows/creorga_update_staff.iss
index 9ffe914..51afd7d 100644 (file)
--- a/install/windows/creorga_update_staff.iss
+++ b/install/windows/creorga_update_staff.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Creorga"
-#define MyAppPublisher "DKS s.à r.l."
+#define MyAppPublisher "DKS s.� r.l."
 #define MyAppURL "http://www.dks.lu/products/creorga.html"
 #define MyAppExeName "Creorga.exe"
 
@@ -28,7 +28,7 @@ DefaultGroupName={#MyAppName}
 ;LicenseFile=C:\Users\ksaff\Release\tag\License.txt
 OutputDir=C:\Users\ksaff\Release
 
-OutputBaseFilename=Update_Creorga_{#MyAppVersion}_director
+OutputBaseFilename=Update_Creorga_{#MyAppVersion}_staff
 SetupIconFile=C:\Users\ksaff\Release\tag\app_v3\chrome\icons\default\winmain.ico
 Compression=lzma
 SolidCompression=yes
@@ -41,11 +41,11 @@ CloseApplications=force
 Uninstallable = no
 
 [Messages]
-SetupAppTitle=mise-à-jour {#MyAppName}
-SetupWindowTitle=mise-à-jour {#MyAppName} {#MyAppVersion}
-WizardReady=Installation de la mise-à-jour vers la version {#MyAppVersion}
-ReadyLabel1=L''assistant dispose à présent de toutes les informations pour installer la mise-à-jour de [name] sur votre ordinateur.
-ReadyLabel2b=Cliquez sur Installer pour procéder la mise-à-jour.
+SetupAppTitle=mise-�-jour {#MyAppName}
+SetupWindowTitle=mise-�-jour {#MyAppName} {#MyAppVersion}
+WizardReady=Installation de la mise-�-jour vers la version {#MyAppVersion}
+ReadyLabel1=L''assistant dispose � pr�sent de toutes les informations pour installer la mise-�-jour de [name] sur votre ordinateur.
+ReadyLabel2b=Cliquez sur Installer pour proc�der la mise-�-jour.
 
 [Languages]
 Name: "french"; MessagesFile: "compiler:Languages\French.isl"