From ce1ed675a34f5e3d1d317e6d8a1bd33de55b72d8 Mon Sep 17 00:00:00 2001 From: Minteck Date: Wed, 25 Jan 2023 21:29:28 +0100 Subject: Updated 9 files and added 2 files (automated) --- .idea/vcs.xml | 6 +++++ absences/index.php | 32 +++++++++++++++++++++-- content/index.php | 20 ++++++++++++--- files/index.php | 14 ++++++++++- holidays/index.php | 2 +- homework/index.php | 16 ++++++++++-- includes/navigation.php | 45 ++++++++------------------------- me/index.php | 67 +++++++++++++++++++++++++++++++++++++++++++++++++ menu/index.php | 4 ++- school/index.php | 5 ++-- timetable/index.php | 16 ++++++++++-- 11 files changed, 177 insertions(+), 50 deletions(-) create mode 100644 .idea/vcs.xml create mode 100755 me/index.php diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/absences/index.php b/absences/index.php index bcc58f3..b9d6392 100755 --- a/absences/index.php +++ b/absences/index.php @@ -1,13 +1,41 @@ -

Cette page n'est pas encore disponible. Nots est un logiciel en développement actif, et certaines pages ne sont pas encore disponibles. En savoir plus.
+
+

+ + +
+ Non justifiée Non résolue
+ setPattern('d MMM yyyy, H:m'); + + $fmt1 = new \IntlDateFormatter('fr_FR'); + $fmt1->setPattern('d MMM yyyy'); + + $fmt2 = new \IntlDateFormatter('fr_FR'); + $fmt2->setPattern('H:m'); + + ?> + format(new \DateTime(date("c", ($absence["from"] + 3600000) / 1000))) === $fmt1->format(new \DateTime(date("c", ($absence["to"] + 3600000) / 1000)))): ?> + le format(new \DateTime(date("c", ($absence["from"] + 3600000) / 1000))) ?> de format(new \DateTime(date("c", ($absence["from"] + 3600000) / 1000))) ?> à format(new \DateTime(date("c", ($absence["to"] + 3600000) / 1000))) ?> + + du format(new \DateTime(date("c", ($absence["from"] + 3600000) / 1000))) ?> au format(new \DateTime(date("c", ($absence["to"] + 3600000) / 1000))) ?> +
+ heure 1 ? "s" : "" ?> de cours manquée 1 ? "s" : "" ?> +
+ +
diff --git a/content/index.php b/content/index.php index e0c0e8a..fee991a 100755 --- a/content/index.php +++ b/content/index.php @@ -1,6 +1,6 @@
-

- - +

Cours

+ +
+ + +
+ +
· ·
-

+

Cours

+ +
+ + +
diff --git a/holidays/index.php b/holidays/index.php index f731d46..005d405 100755 --- a/holidays/index.php +++ b/holidays/index.php @@ -13,7 +13,7 @@ $holidays = $params["publicHolidays"];

-

+

Vacances scolaires

Prochaines vacances :
-

+

Cours

+ +
+ + +
= time()): ?>
; border-left-width: 5px;margin-bottom:10px;"> diff --git a/includes/navigation.php b/includes/navigation.php index c6f1f2e..24779c9 100755 --- a/includes/navigation.php +++ b/includes/navigation.php @@ -10,46 +10,23 @@
  • Accueil
    • -
  • - Mes données - +
  • + Cours
    • -
  • - Cahier de textes - +
  • + Notes
    • -
  • - Notes et évaluations - +
  • + Menu
    • -
  • - Vie scolaire - +
  • + Moi
  • - Communication + Plus
  • diff --git a/me/index.php b/me/index.php new file mode 100755 index 0000000..0a3752b --- /dev/null +++ b/me/index.php @@ -0,0 +1,67 @@ + + +
    +
    + +
    +

    +
    + +

    Année scolaire

    + + + +
    +     +

    + + " . $establishment["address"][1] : "" ?>
    +
    + + " . $establishment["website"] . "" : "" ?> +

    + + + + + +

    + Classes :
    + Groupes : +

    + +
    + +
    + + Absences + + + Équipe pédagogique + + + Vacances scolaires + + + Personalisation + +
    +
    + + diff --git a/menu/index.php b/menu/index.php index 1ac010f..7713339 100755 --- a/menu/index.php +++ b/menu/index.php @@ -11,7 +11,9 @@ $menu = data_menu()["data"]["menu"]; ?>
    -

    +
    + +

    Menu

    diff --git a/school/index.php b/school/index.php index 77f6f9b..30369e5 100755 --- a/school/index.php +++ b/school/index.php @@ -17,7 +17,7 @@ global $_name;

    -

    Année scolaire

    +

    Année scolaire

    @@ -39,8 +39,7 @@ global $_name; Classes :
    Groupes :
    - Identifiant Nots : + }, $user["groups"])) ?>

    diff --git a/timetable/index.php b/timetable/index.php index 869a26f..38e6b6e 100755 --- a/timetable/index.php +++ b/timetable/index.php @@ -1,6 +1,6 @@
    -

    +

    Cours

    + +
    + + +
    • time()): ?> -- cgit