Skip to content

Commit 60a976b

Browse files
committed
Merge branch 'works' into dev
2 parents aff289b + e5a60a8 commit 60a976b

7 files changed

Lines changed: 364 additions & 10 deletions

File tree

README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# 📚 ProJote - Plugin JEEDOM Pronote
22

3-
![Version](https://img.shields.io/badge/version-1.2.0-blue)
3+
![Version](https://img.shields.io/badge/version-1.3.0-blue)
44
![License](https://img.shields.io/badge/license-AGPL%20v3-green)
55
![Jeedom](https://img.shields.io/badge/Jeedom-4.4+-orange)
66

@@ -25,6 +25,11 @@
2525
- Commandes `nouvelle_note` / `nouveau_devoir` : déclenchent vos scénarios sur chaque nouveauté
2626
- Export iCalendar natif (cours + devoirs) abonnable depuis votre agenda
2727

28+
**Panneau desktop multi-élèves** *(v1.3.0+)*
29+
- Page dédiée accessible via une icône sous le menu **Accueil** de Jeedom
30+
- Activation par la case *« Afficher le panneau desktop »* (Plugins → Gestion des plugins → ProJote)
31+
- Un onglet par élève : identité, statistiques, EDT, notes, devoirs, punitions, iCal
32+
2833
**Gestion multi-comptes**
2934
- Support des comptes élèves
3035
- Support des comptes parents

core/php/jeeProJote.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,10 @@
540540
'matiere_en_baisse_detail' => isset($result['Notes']['matiere_en_baisse_detail']) ? $result['Notes']['matiere_en_baisse_detail'] : array(),
541541
'notifications' => isset($result['Notifications']['Notification']) ? $result['Notifications']['Notification'] : array(),
542542
'events' => $events,
543+
'prochain_DS_matiere' => isset($result['Devoirs']['prochain_DS_matiere']) ? $result['Devoirs']['prochain_DS_matiere'] : '',
544+
'prochain_DS_date' => isset($result['Devoirs']['prochain_DS_date']) ? $result['Devoirs']['prochain_DS_date'] : '',
545+
'prochain_DS_dans_jours' => isset($result['Devoirs']['prochain_DS_dans_jours']) ? $result['Devoirs']['prochain_DS_dans_jours'] : null,
546+
'URL_Ical' => isset($result['Ical']) ? $result['Ical'] : '',
543547
'last_update' => date('c'),
544548
);
545549
$eqLogic->setConfiguration('widget_json', json_encode($widget_data));

desktop/php/ProJote.php

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,29 @@
1919
<!-- Page d'accueil du plugin -->
2020
<div class="col-xs-12 eqLogicThumbnailDisplay">
2121
<legend><i class="fas fa-cog"></i> {{Gestion}}</legend>
22-
<!-- Boutons de gestion du plugin -->
23-
<div class="eqLogicThumbnailContainer">
24-
<div class="cursor eqLogicAction logoPrimary" data-action="add">
22+
<!-- Boutons de gestion du plugin — grandes icônes + libellé court dessous -->
23+
<style>
24+
.pj-gestion { display:flex; flex-wrap:wrap; gap:10px; padding:6px 2px; }
25+
.pj-gestion .pj-tile {
26+
display:flex; flex-direction:column; align-items:center; justify-content:flex-start;
27+
width:120px; padding:16px 8px 12px; border-radius:10px; cursor:pointer;
28+
text-align:center; transition:background .15s ease, transform .1s ease;
29+
}
30+
.pj-gestion .pj-tile:hover { background:rgba(127,127,127,.14); transform:translateY(-1px); }
31+
.pj-gestion .pj-tile i { font-size:44px; line-height:1; margin-bottom:12px; }
32+
.pj-gestion .pj-tile span { font-size:13px; font-weight:600; }
33+
</style>
34+
<div class="eqLogicThumbnailContainer pj-gestion">
35+
<div class="pj-tile eqLogicAction logoPrimary" data-action="add">
2536
<i class="fas fa-plus-circle"></i>
26-
<br>
2737
<span>{{Ajouter}}</span>
2838
</div>
29-
<div class="cursor eqLogicAction logoSecondary" data-action="gotoPluginConf">
39+
<div class="pj-tile eqLogicAction logoSecondary" data-action="gotoPluginConf">
3040
<i class="fas fa-wrench"></i>
31-
<br>
3241
<span>{{Configuration}}</span>
3342
</div>
34-
<div class="cursor logoSecondary" id="bt_donProJote" title="{{Faire un don}}">
43+
<div class="pj-tile logoSecondary" id="bt_donProJote" title="{{Faire un don}}">
3544
<i class="fas fa-mug-hot"></i>
36-
<br>
3745
<span>{{Don}}</span>
3846
</div>
3947
</div>

0 commit comments

Comments
 (0)