surya/freeplanet_serverside
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated Project calculation for hours and progress.

Browse Source
This commit is contained in:
Paolo Arena
2019-04-06 21:02:39 +02:00
parent 7c3684813a
commit 6310a7a971
6 changed files with 317 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/tools/general.js
View File

@@ -20,10 +20,12 @@ if (process.env.GCM_API_KEY !== "")
webpush.setGCMAPIKey(process.env.GCM_API_KEY);
webpush.setVapidDetails(subject, publicVapidKey, privateVapidKey);
console.log('setVapidDetails... config...');
// console.log('setVapidDetails... config...');
module.exports = {
FIRST_PROJ: '__PROJECTS',
EXECUTE_CALCPROJ: true,
getHostname: function () {
return os.hostname()
},
@@ -50,7 +52,7 @@ module.exports = {
allfieldTodo: function () {
return ['userId', 'pos', 'category', 'descr', 'priority', 'status', 'created_at', 'modify_at',
'completed_at', 'expiring_at', 'enableExpiring', 'id_prev', 'progress', 'modified']
'completed_at', 'expiring_at', 'enableExpiring', 'id_prev', 'progress', 'modified', 'phase', 'assigned_to_userId', 'hoursplanned', 'hoursworked', 'start_date']
},
allfieldTodoWithId: function () {
@@ -146,16 +148,16 @@ module.exports = {
};
console.log('************ INVIO WEBPUSH.SENDNOTIFICATION N° ', conta, '/', trovati, 'A', subscription.browser);
console.log('vapidDetails', pushOptions.vapidDetails);
// console.log('vapidDetails', pushOptions.vapidDetails);
payload.title = process.env.URLBASE_APP1 + ' Msg n° ' + conta + '/' + trovati;
// payload.message += subscription.browser ;
const pushPayload = JSON.stringify(payload);
console.log('A1) SUBS: pushSubscription', pushSubscription);
console.log('A2) OPZIONI: pushOptions', pushOptions);
console.log('A3) MSG_TO_SEND: pushPayload', pushPayload);
// console.log('A1) SUBS: pushSubscription', pushSubscription);
// console.log('A2) OPZIONI: pushOptions', pushOptions);
// console.log('A3) MSG_TO_SEND: pushPayload', pushPayload);
webpush.sendNotification(
pushSubscription,