From e0f098d33d126fd21d1367a68366e91dccbcfa38 Mon Sep 17 00:00:00 2001 From: Teddy Cornaut Date: Thu, 24 Mar 2022 15:19:58 +0100 Subject: [PATCH] Correction nom --- .../config.json.dist | 0 .../extension.js | 39 ++++++++++-------- .../icon.svg | 0 .../logo.png | Bin .../metadata.json | 0 .../stylesheet.css | 0 6 files changed, 22 insertions(+), 17 deletions(-) rename {ninegate-gnome-extension@cadoles.com => ninebadge-gnome-extension@cadoles.com}/config.json.dist (100%) rename {ninegate-gnome-extension@cadoles.com => ninebadge-gnome-extension@cadoles.com}/extension.js (77%) rename {ninegate-gnome-extension@cadoles.com => ninebadge-gnome-extension@cadoles.com}/icon.svg (100%) rename {ninegate-gnome-extension@cadoles.com => ninebadge-gnome-extension@cadoles.com}/logo.png (100%) rename {ninegate-gnome-extension@cadoles.com => ninebadge-gnome-extension@cadoles.com}/metadata.json (100%) rename {ninegate-gnome-extension@cadoles.com => ninebadge-gnome-extension@cadoles.com}/stylesheet.css (100%) diff --git a/ninegate-gnome-extension@cadoles.com/config.json.dist b/ninebadge-gnome-extension@cadoles.com/config.json.dist similarity index 100% rename from ninegate-gnome-extension@cadoles.com/config.json.dist rename to ninebadge-gnome-extension@cadoles.com/config.json.dist diff --git a/ninegate-gnome-extension@cadoles.com/extension.js b/ninebadge-gnome-extension@cadoles.com/extension.js similarity index 77% rename from ninegate-gnome-extension@cadoles.com/extension.js rename to ninebadge-gnome-extension@cadoles.com/extension.js index a6a315d..36ebb5b 100644 --- a/ninegate-gnome-extension@cadoles.com/extension.js +++ b/ninebadge-gnome-extension@cadoles.com/extension.js @@ -41,11 +41,17 @@ class MyPopup extends PanelMenu.Button { let time = today.getHours() + ":" + today.getMinutes() + ":" + today.getSeconds(); let timeItem = new PopupMenu.PopupMenuItem(''); - let timeLabel = new St.Label({text:'Capital actuel : +0:00'}); + let timeLabel = new St.Label({text:'CAPITAL TOTAL : +0:00'}); timeItem.add(timeLabel); this.menu.addMenuItem(timeItem); + let ifValidateItem = new PopupMenu.PopupMenuItem(''); + let ifValidateLabel = new St.Label({text:'CAPITAL SI VALIDÉ : +0:00'}); + ifValidateItem.add(ifValidateLabel); + + //this.menu.addMenuItem(ifValidateItem); + this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem()); let startItem = new PopupMenu.PopupMenuItem(''); @@ -59,28 +65,27 @@ class MyPopup extends PanelMenu.Button { this.menu.connect('open-state-changed', (menu, open) => { if (open) { - log('opened'); - let result = send_request('https://badge.cadoles.com/ninebadge/rest/showtimers', 'POST', key) - timeLabel.set_text('Capital actuel : ' + result.capitaltime) - let status = send_request('https://badge.cadoles.com/ninebadge/rest/status', 'POST', key) - if(status.status == "started") { - label.set_text('FIN POINTAGE'); - started = true - } else { - started = false - label.set_text('DÉBUT POINTAGE'); + try { + let result = send_request('https://badge.cadoles.com/ninebadge/rest/showtimers', 'POST', key) + timeLabel.set_text('CAPITAL TOTAL : ' + result.capitaltime) + + let status = send_request('https://badge.cadoles.com/ninebadge/rest/status', 'POST', key) + if(status.status == "started") { + label.set_text('FIN POINTAGE'); + started = true + } else { + started = false + label.set_text('DÉBUT POINTAGE'); + } + ifValidateLabel.set_text('CAPITAL SI VALIDÉ : +0:00') + } catch(error) { + log(error); } } }); startItem.connect('activate', () => { - try { - let result = send_request('https://badge.cadoles.com/ninebadge/rest/showtimers', 'POST', key) - timeLabel.set_text('CAPITAL : ' + result.capitaltime) - } catch(error) { - log(error); - } if(started){ send_request('https://badge.cadoles.com/ninebadge/rest/clockout', 'POST', key) started = false diff --git a/ninegate-gnome-extension@cadoles.com/icon.svg b/ninebadge-gnome-extension@cadoles.com/icon.svg similarity index 100% rename from ninegate-gnome-extension@cadoles.com/icon.svg rename to ninebadge-gnome-extension@cadoles.com/icon.svg diff --git a/ninegate-gnome-extension@cadoles.com/logo.png b/ninebadge-gnome-extension@cadoles.com/logo.png similarity index 100% rename from ninegate-gnome-extension@cadoles.com/logo.png rename to ninebadge-gnome-extension@cadoles.com/logo.png diff --git a/ninegate-gnome-extension@cadoles.com/metadata.json b/ninebadge-gnome-extension@cadoles.com/metadata.json similarity index 100% rename from ninegate-gnome-extension@cadoles.com/metadata.json rename to ninebadge-gnome-extension@cadoles.com/metadata.json diff --git a/ninegate-gnome-extension@cadoles.com/stylesheet.css b/ninebadge-gnome-extension@cadoles.com/stylesheet.css similarity index 100% rename from ninegate-gnome-extension@cadoles.com/stylesheet.css rename to ninebadge-gnome-extension@cadoles.com/stylesheet.css