v20200922 macmenu

diff --git a/app/tmpl/module/periods/reportperiod.js b/app/tmpl/module/periods/reportperiod.js
index 123231f..2ac82d4 100644 (file)
--- a/app/tmpl/module/periods/reportperiod.js
+++ b/app/tmpl/module/periods/reportperiod.js
@@ -45,19 +45,19 @@ let reportperiod ={
         
             //
         {title: "Département",field:"groupname" , visible: false},
-        {title: "Prénom", field:"prename",headerSort: false},
-        {title: "Nom", field:"surname",headerSort: false},
-        {title: "Contrat", field:"contracthours",hozAlign:"right",headerSort: false},
-        {title: "Travail", field:"workhours",hozAlign:"right",headerSort: false},
-        {title: "Récup", field:"recuperationhours",hozAlign:"right",headerSort: false,formatter:periodRecupFormatter},
-        {title: "congé", field:"vacancynormal",hozAlign:"right",headerSort: false},
-        {title: "congé<br/>maladie", field:"vacancyill",hozAlign:"right",headerSort: false},
-        {title: "Total", field:"totalhours",hozAlign:"right",headerSort: false,formatter:periodTotalFormatter},
-        {title: "décompte<br/>reporté", field:"transferedhours",hozAlign:"right",headerSort: false},
-        {title: "payés", field:"payedhours",hozAlign:"right",headerSort: false} ,
-        {title: "décompte<br/>fin POT", field:"hoursdiff",hozAlign:"right",headerSort: false},
-        {title: "congé suppl.<br/>+44 h", field:"suppvacancy44hours",hozAlign:"right",headerSort: false},
-        {title: "congé suppl.<br/>trav dim.", field:"suppvacancysunwork",hozAlign:"right",headerSort: false},
+        {title: '<span style="font-size: 9pt;">Prénom</span>', field:"prename",headerSort: false},
+        {title: '<span style="font-size: 9pt;">Nom</span>', field:"surname",headerSort: false},
+        {title: '<span style="font-size: 9pt;">Contrat</span>', field:"contracthours",hozAlign:"right",headerSort: false},
+        {title: '<span style="font-size: 9pt;">Travail</span>', field:"workhours",hozAlign:"right",headerSort: false},
+        {title: '<span style="font-size: 9pt;">Récup</span>', field:"recuperationhours",hozAlign:"right",headerSort: false,formatter:periodRecupFormatter},
+        {title: '<span style="font-size: 9pt;">Congé</span>', field:"vacancynormal",hozAlign:"right",headerSort: false},
+        {title: '<span style="font-size: 9pt;">Congé<br/>maladie</span>', field:"vacancyill",hozAlign:"right",headerSort: false},
+        {title: '<span style="font-size: 9pt;">Total</span>', field:"totalhours",hozAlign:"right",headerSort: false,formatter:periodTotalFormatter},
+        {title: '<span style="font-size: 9pt;">Décompte<br/>reporté</span>', field:"transferedhours",hozAlign:"right",headerSort: false},
+        {title: '<span style="font-size: 9pt;">Payés</span>', field:"payedhours",hozAlign:"right",headerSort: false} ,
+        {title: '<span style="font-size: 9pt;">Décompte<br/>fin POT</span>', field:"hoursdiff",hozAlign:"right",headerSort: false},
+        {title: '<span style="font-size: 9pt;">suppl.<br/>+44h</span>', field:"suppvacancy44hours",hozAlign:"right",headerSort: false,headerVertical:true},
+        {title: '<span style="font-size: 9pt;">suppl.<br/>trav dim.</span>', field:"suppvacancysunwork",hozAlign:"right",headerSort: false,headerVertical:true},
         //{title: "jours<br/>ouvrables", field:"maxdays",hozAlign:"right",headerSort: false},
         {title: "moy.<br/>hebd.", field:"avgtotalweekhours",hozAlign:"right",headerSort: false,formatter:periodAVGFormatter},
         {title: "validé", field:"isvalidated",hozAlign:"center",headerSort: false,formatter:"tickCross", formatterParams:{allowEmpty:true,allowTruthy: false}},

diff --git a/app/tmpl/module/staff/staffperiods.js b/app/tmpl/module/staff/staffperiods.js
index 5a15c85..d158ab6 100644 (file)
--- a/app/tmpl/module/staff/staffperiods.js
+++ b/app/tmpl/module/staff/staffperiods.js
@@ -13,22 +13,21 @@ let staffperiods = {
 
       columns: [
         
-        {title: "Début",field: "startdate",headerSort:"datetime",formatter:"datetime",formatterParams:{inputFormat:"YYYY-MM-DD",outputFormat:"DD.MM.YYYY",invalidPlaceholder:""} },
-        {title: "Fin",field: "enddate",headerSort:"datetime",formatter:"datetime",formatterParams:{inputFormat:"YYYY-MM-DD",outputFormat:"DD.MM.YYYY",invalidPlaceholder:""} },
-        {title: "Contrat", field:"contracthours",hozAlign:"right", headerSort: false},
-        {title: "Travail", field:"workhours",hozAlign:"right",headerSort: false},
-        {title: "Récup", field:"recuperationhours",hozAlign:"right",headerSort: false,formatter:periodRecupFormatter},
-        {title: "congé", field:"vacancynormal",hozAlign:"right",headerSort: false},
-        {title: "congé<br/>maladie", field:"vacancyill",hozAlign:"right",headerSort: false},
-        {title: "Total", field:"totalhours",hozAlign:"right",headerSort: false,formatter:periodTotalFormatter},
-        {title: "décompte<br/>reporté", field:"transferedhours",hozAlign:"right",headerSort: false},
-        {title: "payés", field:"payedhours",hozAlign:"right",headerSort: false} ,
-        {title: "décompte<br/>fin POT", field:"hoursdiff",headerSort: false,hozAlign:"right"},
-        {title: "congé suppl.<br/>+44 h", field:"suppvacancy44hours",hozAlign:"right",headerSort: false},
-        {title: "congé suppl.<br/>trav dim.", field:"suppvacancysunwork",hozAlign:"right",headerSort: false},
-        {title: "jours<br/>ouvrables", field:"maxdays",hozAlign:"right",headerSort: false},
-        {title: "moy.<br/>hebd.", field:"avgtotalweekhours",hozAlign:"right",headerSort: false,formatter:periodAVGFormatter},
-        {title: "validé", field:"isvalidated",hozAlign:"center",headerSort: false,formatter:"tickCross", formatterParams:{allowEmpty:true,allowTruthy: false}}
+        {title: '<span style="font-size: 9pt;">Début</span>',field: "startdate",headerSort:"datetime",formatter:"datetime",formatterParams:{inputFormat:"YYYY-MM-DD",outputFormat:"DD.MM.YYYY",invalidPlaceholder:""} },
+        {title: '<span style="font-size: 9pt;">Fin</span>',field: "enddate",headerSort:"datetime",formatter:"datetime",formatterParams:{inputFormat:"YYYY-MM-DD",outputFormat:"DD.MM.YYYY",invalidPlaceholder:""} },
+        {title: '<span style="font-size: 9pt;">Contrat</span>', field:"contracthours",hozAlign:"right", headerSort: false},
+        {title: '<span style="font-size: 9pt;">Travail</span>', field:"workhours",hozAlign:"right",headerSort: false},
+        {title: '<span style="font-size: 9pt;">Récup</span>', field:"recuperationhours",hozAlign:"right",headerSort: false,formatter:periodRecupFormatter},
+        {title: '<span style="font-size: 9pt;">congé</span>', field:"vacancynormal",hozAlign:"right",headerSort: false},
+        {title: '<span style="font-size: 9pt;">Congé<br/>maladie</span>', field:"vacancyill",hozAlign:"right",headerSort: false},
+        {title: '<span style="font-size: 9pt;">Total</span>', field:"totalhours",hozAlign:"right",headerSort: false,formatter:periodTotalFormatter},
+        {title: '<span style="font-size: 9pt;">décompte<br/>reporté</span>', field:"transferedhours",hozAlign:"right",headerSort: false},
+        {title: '<span style="font-size: 9pt;">payés</span>', field:"payedhours",hozAlign:"right",headerSort: false} ,
+        {title: '<span style="font-size: 9pt;">décompte<br/>fin POT</span>', field:"hoursdiff",headerSort: false,hozAlign:"right"},
+        {title: '<span style="font-size: 9pt;">suppl.<br/>+44 h</span>', field:"suppvacancy44hours",hozAlign:"right",headerSort: false,headerVertical:true},
+        {title: '<span style="font-size: 9pt;">suppl.<br/>trav dim.</span>', field:"suppvacancysunwork",hozAlign:"right",headerSort: false,headerVertical:true},
+        {title: '<span style="font-size: 9pt;">moy.<br/>hebd.</span>', field:"avgtotalweekhours",hozAlign:"right",headerSort: false,formatter:periodAVGFormatter},
+        {title: '<span style="font-size: 9pt;">validé</span>', field:"isvalidated",hozAlign:"center",headerSort: false,formatter:"tickCross", formatterParams:{allowEmpty:true,allowTruthy: false}}
           ]
     });
     

diff --git a/desktopapp/main.js b/desktopapp/main.js
index 8618095..827baf3 100644 (file)
--- a/desktopapp/main.js
+++ b/desktopapp/main.js
@@ -1,5 +1,5 @@
 
-const {app,shell, BrowserWindow, globalShortcut} = require('electron')
+const {app,shell, BrowserWindow, globalShortcut, Menu} = require('electron')
 const path = require('path')
 const os = require('os')
 const fs = require('fs')
@@ -39,7 +39,18 @@ function createWindow () {
   console.log("loding URL:" + appcfg.host)
   mainWindow.loadURL(appcfg.host,{userAgent: ua});
   if (os.platform() == "darwin"){
-    mainWindow.setMenuBarVisibility(false)
+    const template = [
+      {label: 'Edit',submenu: [ {role: 'undo'}, {role: 'redo'},{type: 'separator'},{role: 'cut'},{role: 'copy'},{role: 'paste'},{role: 'pasteandmatchstyle'},{role: 'delete'},{role: 'selectall'}]},
+      {label: 'View',submenu: [{role: 'reload'}, {role: 'forcereload'},{role: 'toggledevtools'},{type: 'separator'},{role: 'resetzoom'},{role: 'zoomin'},{role: 'zoomout'},{type: 'separator'},{role: 'togglefullscreen'}]},
+      {role: 'window',submenu: [{role: 'minimize'},{role: 'close'}]},
+      {role: 'help',submenu: [{label: 'Learn More',click () { require('electron').shell.openExternal('https://electronjs.org') }}]}]
+      template.unshift({ label: app.getName(), submenu: [ {role: 'about'}, {type: 'separator'}, {role: 'services', submenu: []}, {type: 'separator'}, {role: 'hide'}, {role: 'hideothers'},  {role: 'unhide'},  {type: 'separator'}, {role: 'quit'}
+        ]
+      })
+    template[1].submenu.push(  {type: 'separator'}, { label: 'Speech', submenu: [  {role: 'startspeaking'}, {role: 'stopspeaking'} ] } )
+    template[3].submenu = [ {role: 'close'}, {role: 'minimize'}, {role: 'zoom'}, {type: 'separator'}, {role: 'front'} ]
+    const menu = Menu.buildFromTemplate(template)
+    Menu.setApplicationMenu(menu)
   } else {
     mainWindow.setMenu(null)
   }

diff --git a/desktopapp/package.json b/desktopapp/package.json
index dc0600d..0b8ecd4 100644 (file)
--- a/desktopapp/package.json
+++ b/desktopapp/package.json
@@ -7,7 +7,7 @@
     "start": "electron .",
     "package-win64": "electron-packager . pot --overwrite --platform=win32 --arch=x64 --asar --out=../release-builds --version-string.CompanyName=DKS --version-string.FileDescription=DKS --version-string.ProductName=POT --icon=img/POT-logo.ico",
     "package-win32": "electron-packager . pot --overwrite --platform=win32 --arch=ia32 --asar --out=../release-builds --version-string.CompanyName=DKS --version-string.FileDescription=DKS --version-string.ProductName=POT --icon=img/POT-logo.ico",
-    "package-macos": "electron-packager . pot --overwrite --plattform=darwin --arch=x64 --asar --out=../release-builds --icon=img/POT-logo.icns --prune=true"
+    "package-macos": "electron-packager . POT --overwrite --plattform=darwin --arch=x64 --asar --out=../release-builds --icon=img/POT-logo.icns --prune=true"
   },
   "keywords": [
     "planning",