From 29173c38a791d9b742c9380c9079291713af39e4 Mon Sep 17 00:00:00 2001 From: Marie Morillon Date: Thu, 21 Mar 2019 17:29:48 +0100 Subject: [PATCH 1/7] petites modifications dont texte accueil page annuaire --- app/templates/pages/annuaire.html | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/app/templates/pages/annuaire.html b/app/templates/pages/annuaire.html index b81b850..d9d97ce 100644 --- a/app/templates/pages/annuaire.html +++ b/app/templates/pages/annuaire.html @@ -11,11 +11,11 @@
-

Annuaire du master TNAH de l'école nationale des chartes

-

Ecrire un petit texte pour présenter les sympathiques étudiants du master et les informations qui seront disponibles à propos d'eux sur cette page : noms et prénoms, promotion, CV, linkedIn, Git, et s'ils ont été professeurs ou non

+

Annuaire du master TNAH de l'École nationale des chartes

+

Retrouvez les informations de contact des étudiant·e·s du Master TNAH inscrit·e·s sur TNAHBox.

Il y a {{resultats.total}} personnes inscrites sur l'annuaire TNAH :

- - + + @@ -74,14 +74,7 @@

Annuaire du master TNAH de l'école nationale des

{% endfor %} - - - - - - - From bd6e801059eeb391d447a436d4561713b8347b2e Mon Sep 17 00:00:00 2001 From: Marie Morillon Date: Fri, 22 Mar 2019 12:20:18 +0100 Subject: [PATCH 2/7] =?UTF-8?q?design=20page=20personne=20modifi=C3=A9=20p?= =?UTF-8?q?our=20responsive=20design=20et=20ajouts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/templates/pages/annuaire.html | 3 +- app/templates/pages/person.html | 115 ++++++++++++--------- app/templates/partials/retour_accueil.html | 8 ++ 3 files changed, 75 insertions(+), 51 deletions(-) create mode 100644 app/templates/partials/retour_accueil.html diff --git a/app/templates/pages/annuaire.html b/app/templates/pages/annuaire.html index d9d97ce..2f0fc49 100644 --- a/app/templates/pages/annuaire.html +++ b/app/templates/pages/annuaire.html @@ -93,6 +93,7 @@

{{titre}}

{% endfor %} --> - + {% include "partials/retour_accueil.html" %} + {% endblock %} diff --git a/app/templates/pages/person.html b/app/templates/pages/person.html index 721dfdd..00e3474 100644 --- a/app/templates/pages/person.html +++ b/app/templates/pages/person.html @@ -27,56 +27,71 @@

{{person.person_name}} {{person.person_firstName}} ({{person.person_promotio --> -
-
- -
-

{{person.person_firstName}} {{person.person_name}}

- -

promotion : {{person.person_promotion}}

- {% if person.person_cv %} -

{{person.person_cv}}

- {% else %} -

Le CV de {{person.person_firstName}} {{person.person_name}} n'a pas été rempli.

- {% endif %} -
-
- - -
-
-

Elsewhere

-
    -
  1. GitHub : - {% if person.person_git %} - {{(person.person_git).replace("https://github.com/","")|safe}} - - {% else %} - Aucun compte GitHub n'a été renseigné. - {% endif %} -
    2. -
  2. linkedIn : - {% if person.person_linkedIn %} - {{person.person_firstName}} {{person.person_name}} - {% else %} - Aucun compte LinkedIn n'a été renseigné. - {% endif %} -
    3. -
  3. adresse mail : {{person.person_email}}
    4. -
-
-
-
- - - - - - -
- Retour à l'accueil + +
+ +
+

{{person.person_firstName}} {{person.person_name}}

+ +
Promotion
+ {% if person.person_promotion %} +
{{person.person_promotion}}
+ {% else %} +
Le promotion de {{person.person_firstName}} {{person.person_name}} n'a pas été renseignée.
+ {% endif %} +
CV
+ {% if person.person_cv %} +
{{person.person_cv}}
+ {% else %} +
Le CV de {{person.person_firstName}} {{person.person_name}} n'a pas été rempli.
+ {% endif %} + +
+
+ +
+
+
+

Contact

+
    +
  1. GitHub : + {% if person.person_git %} + {{(person.person_git).replace("https://github.com/","")|safe}} + + {% else %} + Aucun compte GitHub n'a été renseigné. + {% endif %} +
    2. +
  2. LinkedIn : + {% if person.person_linkedIn %} + {{person.person_firstName}} {{person.person_name}} + {% else %} + Aucun compte LinkedIn n'a été renseigné. + {% endif %} +
    3. +
  3. Adresse email : {{person.person_email}} +
    4. +
+
+
+
+
+
Documents ajoutés :
+
{{person.person_firstName}} {{person.person_name}} n'a ajouté aucun document à TNAHBox.
+
+
+ Dernière connexion : + 00/00/0000 +
+
+ + + + + + {% include "partials/retour_accueil.html" %} + {% endblock %} \ No newline at end of file diff --git a/app/templates/partials/retour_accueil.html b/app/templates/partials/retour_accueil.html new file mode 100644 index 0000000..186441c --- /dev/null +++ b/app/templates/partials/retour_accueil.html @@ -0,0 +1,8 @@ + \ No newline at end of file From 56e129787da738cf7c997d8b32603e56efa50ca6 Mon Sep 17 00:00:00 2001 From: Marie Morillon Date: Fri, 22 Mar 2019 13:57:26 +0100 Subject: [PATCH 3/7] =?UTF-8?q?ajout=20sur=20la=20page=20person.html=20des?= =?UTF-8?q?=20documents=20cr=C3=A9=C3=A9s=20par=20la=20personne=20+=20foot?= =?UTF-8?q?er?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/templates/pages/person.html | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/templates/pages/person.html b/app/templates/pages/person.html index 00e3474..006acfb 100644 --- a/app/templates/pages/person.html +++ b/app/templates/pages/person.html @@ -76,12 +76,18 @@

Contact

-
Documents ajoutés :
-
{{person.person_firstName}} {{person.person_name}} n'a ajouté aucun document à TNAHBox.
+ {% if person.created_document %} +
Documents ajoutés par {{person.person_firstName}} {{person.person_name}}
+ {% for document in person.created_document %} +
{{document.document_title}}
+ {% endfor %} + {% else %} +
{{person.person_firstName}} {{person.person_name}} n'a ajouté aucun document à TNAHBox.
+ {% endif %}
Dernière connexion : - 00/00/0000 +
From 4cdf8ceef5b24c11a56923b27dd44b5c6ed337cf Mon Sep 17 00:00:00 2001 From: Marie Morillon Date: Fri, 22 Mar 2019 14:36:02 +0100 Subject: [PATCH 4/7] =?UTF-8?q?tentative=20d'afficher=20total=20des=20docu?= =?UTF-8?q?ments=20ajout=C3=A9s=20par=20une=20personne=20;=20WIP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/templates/pages/person.html | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app/templates/pages/person.html b/app/templates/pages/person.html index 006acfb..00b886c 100644 --- a/app/templates/pages/person.html +++ b/app/templates/pages/person.html @@ -75,9 +75,15 @@

Contact

-
+
+
Dernière connexion :
+ +
+
+
Documents ajoutés :
{% if person.created_document %} -
Documents ajoutés par {{person.person_firstName}} {{person.person_name}}
+

{{person.person_firstName}} {{person.person_name}} a ajouté {{person.created_document.total}} documents dans TNAHBox :

+ {% for document in person.created_document %}
{{document.document_title}}
{% endfor %} @@ -85,10 +91,7 @@

Contact

{{person.person_firstName}} {{person.person_name}} n'a ajouté aucun document à TNAHBox.
{% endif %}
-
- Dernière connexion : -
From b6bc7474b1c40dd13dc9f88c2858b8b30f6fc1be Mon Sep 17 00:00:00 2001 From: Marie Morillon Date: Mon, 25 Mar 2019 10:34:15 +0100 Subject: [PATCH 5/7] =?UTF-8?q?am=C3=A9lioration=20pages=20annuaire=20et?= =?UTF-8?q?=20person=20:=20visuel,=20affichage=20contenu,=20adresse=20mail?= =?UTF-8?q?=20par=20d=C3=A9faut?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/templates/pages/annuaire.html | 11 +++++++++-- app/templates/pages/person.html | 8 +++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app/templates/pages/annuaire.html b/app/templates/pages/annuaire.html index 2f0fc49..c6d478f 100644 --- a/app/templates/pages/annuaire.html +++ b/app/templates/pages/annuaire.html @@ -66,8 +66,15 @@

Annuaire du master TNAH de l'École nationale des {% endif %}

- ({{found_person.person_promotion}}) - + + {% if found_person.person_promotion %} + ({{found_person.person_promotion}}) + {% else %} + (20..-20..) + {% endif %} + + diff --git a/app/templates/pages/person.html b/app/templates/pages/person.html index 00b886c..a014497 100644 --- a/app/templates/pages/person.html +++ b/app/templates/pages/person.html @@ -69,8 +69,14 @@

Contact

Aucun compte LinkedIn n'a été renseigné. {% endif %} -
  • Adresse email : {{person.person_email}} +
  • Adresse email : + {% if person.person_email %} + {{person.person_email}} + {% else %} + Aucune adresse mail n'a été renseignée.
    Essayez : {{person.person_firstName}}.{{person.person_name}}@chartes.psl.eu     + {% endif %}
    • + From 5da43fdaea69a041be7c0e8b844a248927590245 Mon Sep 17 00:00:00 2001 From: Marie Morillon Date: Mon, 25 Mar 2019 15:16:14 +0100 Subject: [PATCH 6/7] =?UTF-8?q?compte=20nombre=20documents=20ajout=C3=A9s?= =?UTF-8?q?=20pour=20une=20personne?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/routes/routes.py | 2 ++ app/templates/pages/annuaire.html | 2 +- app/templates/pages/person.html | 12 ++++++++---- db.sqlite | Bin 45056 -> 45056 bytes 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/routes/routes.py b/app/routes/routes.py index dd73fab..1077534 100755 --- a/app/routes/routes.py +++ b/app/routes/routes.py @@ -209,6 +209,8 @@ def person(person_id): person=requested_person) + + @app.route("/annuaire") def annuaire(): page = request.args.get("page", 1) diff --git a/app/templates/pages/annuaire.html b/app/templates/pages/annuaire.html index c6d478f..d8691e3 100644 --- a/app/templates/pages/annuaire.html +++ b/app/templates/pages/annuaire.html @@ -70,7 +70,7 @@

    Annuaire du master TNAH de l'École nationale des {% if found_person.person_promotion %} ({{found_person.person_promotion}}) {% else %} - (20..-20..) + {% endif %} +
    Description :
    +
    Documents ajoutés :
    {% if person.created_document %} -

    {{person.person_firstName}} {{person.person_name}} a ajouté {{person.created_document.total}} documents dans TNAHBox :

    - +

    {{person.person_firstName}} {{person.person_name}} a ajouté {{person.created_document.count(document)+1}} document(s) dans TNAHBox :

    + {% for document in person.created_document %}
    {{document.document_title}}
    {% endfor %} diff --git a/db.sqlite b/db.sqlite index 0d8b083855939b67d3f58cb664e145cf8c183da4..60d9fc4705a81d7c6fb1233b2960136102083f50 100644 GIT binary patch delta 76 zcmZp8z|`=7X@WE($3z)tRt^R|#;A=ctL+&dZ5CA6!9V$gzZ4$>1h6r)@G~-)O#a|6 c$^MJ~6aOpz$D0Kg+~Eg`GMa4u5HAn_08XbCfdBvi delta 73 zcmV-P0Ji^t-~xc)0+1U42ay~@1qT2w9I&xut3LtLvk@S;50l7G8V&(ad30!RZUzGc f0RaF5lkiU&1?ms_5Aw4SklYWG>#q&7_g@K6e=r&n From b74ff84d89792cb09147649ecec98c1cb49c0b37 Mon Sep 17 00:00:00 2001 From: Marie Morillon Date: Mon, 25 Mar 2019 15:43:30 +0100 Subject: [PATCH 7/7] maj BDD et footer --- app/templates/partials/retour_accueil.html | 2 +- db.sqlite | Bin 45056 -> 45056 bytes 2 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 app/templates/partials/retour_accueil.html mode change 100644 => 100755 db.sqlite diff --git a/app/templates/partials/retour_accueil.html b/app/templates/partials/retour_accueil.html old mode 100644 new mode 100755 index 186441c..cf26070 --- a/app/templates/partials/retour_accueil.html +++ b/app/templates/partials/retour_accueil.html @@ -5,4 +5,4 @@

    © DJ Python - Promotion 2019

    -

    \ No newline at end of file + diff --git a/db.sqlite b/db.sqlite old mode 100644 new mode 100755 index 60d9fc4705a81d7c6fb1233b2960136102083f50..555bde388f8064d0092684a476751e98cbf54838 GIT binary patch delta 1188 zcmZuwU1-}@6uz>QICdi6m{gc7^(v2)&=JLwWl3>hq;8U>Y|fI#*$9IX^mA>C=*N@f zCMk^69oy?#{7}dqw#TJ?*orCarL>)2_TG_oTcCwP8S4UL8w|FWT`9B=V-kmRbiecS z9o=&-KaO2~9J@M}t^fcAu?%1#uw<`IiuiEqC;azwgy6_y#r}mP!haL@npNe;L!`G7&S56HKgHvOGS zKLB$e_gV$nuK#`u1r@dB?Kr5w3#HEe><_!4!SNzj5axUP7m?*Qo2ca@)ysRRP=aHhxg4f$3rjz$i&xxnY zCCo4~rX9o`)8r-(gTsJf z06oF97imC)90-sfJeRYf5he-s|8*|EQ{LWImaOrTs30DRNECQf)D1zGB}L#%LQN|v z_?3CtP(?$KRZUckqQuL(VwCt3f>f&&w3=oJFRoDP?!EkGI!_J7$Sg7M>Ma{NL4T4U zM~Rha@CIqjzCU#U;Lq?ocn7Y-S5gPvH2Y0z_l^Dm!01da0}NM}*O1+`)F2vzrq|o| zaUwOEOQXfwy?xs?y$D;@v9U0&xQYVL)m`Tz@{TJb)|xOKKk%Zy!U^?| z-asA}7SpP^j^VQlwrL@D#r1+qI1VpSH0m5LtS?pAh4Oso&g?4j0QdYg?0mcYQi@pF z2^y}`Pf`Q{$j)!eqkX@?zv1uQ^wmSydG;mU`D=q7qTmexe}zBdox6c!_aHMuk$`(0 zFY+c=y-+Dzn1sF4z3VOvW9ORy{seErd+-Q5e+rosBuD($m+IX6WFGrI1@IsECp>~r xyXln!81JJw`j{(ufzf>M{zgvd^H=`A$yWrojp<~zl%RP0LSu;B-Q5h1S=p>SnxQNVe! zt>FwXMnG?Bo3*{RuU5V#4q+)da4JzHXqx0K?QAK>ghZXD9wnx@W@-npjV@lGjVrjI zSG6m(;}}y9D({TnPnQn;I!uNE5|PsS39Lfg%Gmk+f^`tzDddi_7H@}IPIY3#n5C*j zBP3?;7BW`$fCdOPNz%&Y?JU#8CyI5zcYMM+4n_Vo^7?X$yo&J-`C}raiyg0gR7L_z z{4-%HKlp_`d~=Ls3l&g=L4=VW3s7_cKkyk{abH8nwbw=kYyiGs0|x@$Aa9(<1RDVU h;