From 4ac11291a79f9410af079e0419581f854c214453 Mon Sep 17 00:00:00 2001 From: Phuoc CAO Date: Thu, 2 Dec 2021 16:27:56 +0100 Subject: [PATCH] =?UTF-8?q?am=C3=A9lioration=20de=20la=20page=20Accueil?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- caotek_mesavoirs/models/contents.py | 4 +- caotek_mesavoirs/templates/contents/folder.pt | 7 +-- caotek_mesavoirs/templates/home.pt | 6 +-- caotek_mesavoirs/views/contents.py | 7 +-- caotek_mesavoirs/views/default.py | 2 +- gmail_caotek_purge.py | 50 +++++++++++++++++++ gmail_purge.py => gmail_ctphuoc_purge.py | 2 +- gmail_nb.py | 34 ------------- setup.py | 2 +- 9 files changed, 66 insertions(+), 48 deletions(-) create mode 100644 gmail_caotek_purge.py rename gmail_purge.py => gmail_ctphuoc_purge.py (93%) delete mode 100644 gmail_nb.py diff --git a/caotek_mesavoirs/models/contents.py b/caotek_mesavoirs/models/contents.py index 9b943cc..1dc7d1a 100644 --- a/caotek_mesavoirs/models/contents.py +++ b/caotek_mesavoirs/models/contents.py @@ -32,8 +32,8 @@ def get_docs_bytopic(request, topic, logged_in): anon = "AND statut = 'public' " else: anon = "" - if topic == 'BLOG': - query = "SELECT * FROM docs WHERE topic=:topic %s ORDER BY cree_le DESC LIMIT 10;" % anon + if topic == 'home': + query = "SELECT * FROM docs WHERE topic='blog' %s ORDER BY cree_le DESC LIMIT 10;" % anon else: query = "SELECT * FROM docs WHERE topic=:topic ORDER BY intitule;" results = request.dbsession.execute(query, {'topic': topic}).fetchall() diff --git a/caotek_mesavoirs/templates/contents/folder.pt b/caotek_mesavoirs/templates/contents/folder.pt index 3c306ad..2c78c60 100644 --- a/caotek_mesavoirs/templates/contents/folder.pt +++ b/caotek_mesavoirs/templates/contents/folder.pt @@ -9,9 +9,9 @@ + - @@ -24,7 +24,7 @@ var dataSet = ${dt_data}; $(document).ready(function() { - $.fn.dataTable.moment('DD/MM/YYYY - HH:mm'); + $.fn.dataTable.moment('DD.MM.YY'); $('#folder_list').DataTable({ data: dataSet, pageLength: 50, @@ -32,8 +32,9 @@ language: { url: 'https://cdn.datatables.net/plug-ins/1.10.16/i18n/French.json' }, + order: [[ 0, "desc" ]], columnDefs: [ - { "targets": 0, + { "targets": 1, "render": function (data, type, row, meta) { // ajouter un link vers le formulaire return '' + data + ''; diff --git a/caotek_mesavoirs/templates/home.pt b/caotek_mesavoirs/templates/home.pt index 69b695e..aaaae25 100644 --- a/caotek_mesavoirs/templates/home.pt +++ b/caotek_mesavoirs/templates/home.pt @@ -4,15 +4,15 @@

-
- cover_image
+ cover_image

Derniers posts

Date Titre TagsDate
- +
${ligne.cree_le.strftime("%d %b")}${ligne.modif_le.strftime("%d %b %y")} ${ligne.intitule}
diff --git a/caotek_mesavoirs/views/contents.py b/caotek_mesavoirs/views/contents.py index 4b2a45b..a0edd06 100644 --- a/caotek_mesavoirs/views/contents.py +++ b/caotek_mesavoirs/views/contents.py @@ -35,8 +35,8 @@ def folder(request): for tag in tags: tags_list += tag.tag + ', ' - cree_le = item.cree_le.strftime('%d/%m/%Y') - d = (item.intitule, tags_list, cree_le, item.doc_id) + modif_le = item.cree_le.strftime('%d.%m.%y') + d = (modif_le, item.intitule, tags_list, item.doc_id) liste.append(d) return { @@ -134,7 +134,8 @@ def doc_search(request): return { 'page_title': "Rechercher", - 'dt_data': json.dumps(liste), 'critere': critere, + 'dt_data': json.dumps(liste), + 'critere': critere, } @view_config(route_name='doc_view', renderer='../templates/contents/doc_view.pt') diff --git a/caotek_mesavoirs/views/default.py b/caotek_mesavoirs/views/default.py index 774e1d9..979c622 100644 --- a/caotek_mesavoirs/views/default.py +++ b/caotek_mesavoirs/views/default.py @@ -72,7 +72,7 @@ def home(request): id_photo = member.photo_instagram # lire toutes les docs - items = get_docs_bytopic(request, 'blog', logged_in) + items = get_docs_bytopic(request, 'home', logged_in) return { 'page_title': "Méditer, c’est ouvrir la cage", diff --git a/gmail_caotek_purge.py b/gmail_caotek_purge.py new file mode 100644 index 0000000..5dc4ef8 --- /dev/null +++ b/gmail_caotek_purge.py @@ -0,0 +1,50 @@ +# -*- coding: utf8 -*- +# +# Compter les emails BEFORE DATE +# + +from pprint import pprint +import datetime +import imaplib + +# connecter au serveur IMAP +conn = imaplib.IMAP4_SSL('imap.gmail.com') +conn.login('phuoc@caotek.fr', 'pcao.8211') +# lister les dossiers +typ, data = conn.list() +print('Liste des dossiers :') +pprint(data) + +# delete mails before 14 years +before_date = (datetime.date.today() - datetime.timedelta(365.25 * 13)).strftime("%d-%b-%Y") +print("Delete emails before " + before_date) + +# select ALL +conn.select('INBOX') + +rv, data = conn.search(None, '(BEFORE {0})'.format(before_date)) +nb_mails = str(len(data[0])) +print(nb_mails + " emails founded") + +resp = input ("Enter 'c' to continue, or 'a' to abort : ") +if resp=="c": + print("Moving " + nb_mails + " emails to Trash") + messages = data[0].split(b' ') + for mail in messages: + # move to trash + conn.store(mail, '+X-GM-LABELS', '\\Trash') + + #This block empties trash, remove if you want to keep, Gmail auto purges trash after 30 days. + print("Emptying Trash & Expunge...") + conn.select('[Gmail]/Corbeille') + conn.store("1:*", '+FLAGS', '\\Deleted') + # delete all the selected messages + conn.expunge() + print("Script completed") +else: + print("Script aborted") + +# deconnexion du serveur +conn.close() +conn.logout() + diff --git a/gmail_purge.py b/gmail_ctphuoc_purge.py similarity index 93% rename from gmail_purge.py rename to gmail_ctphuoc_purge.py index baaba77..3ac980f 100644 --- a/gmail_purge.py +++ b/gmail_ctphuoc_purge.py @@ -17,7 +17,7 @@ print('Liste des dossiers :') pprint(data) # delete mails before 14 years -before_date = (datetime.date.today() - datetime.timedelta(5110)).strftime("%d-%b-%Y") +before_date = (datetime.date.today() - datetime.timedelta(365.25 * 13)).strftime("%d-%b-%Y") print("Delete emails before " + before_date) # select ALL diff --git a/gmail_nb.py b/gmail_nb.py deleted file mode 100644 index c49e81a..0000000 --- a/gmail_nb.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf8 -*- -# -# Compter les emails BEFORE DATE -# - -from pprint import pprint -import datetime -import imaplib - -# connecter au serveur IMAP -conn = imaplib.IMAP4_SSL('imap.gmail.com') -conn.login('ctphuoc@gmail.com', 'ztwciswzhxxogcfv') - -# lister les dossiers -typ, data = conn.list() -print('Liste des dossiers :') -pprint(data) - -# delete mails before 15 years -before_date = (datetime.date.today() - datetime.timedelta(10)).strftime("%d-%b-%Y") -print("Supprimer emails avant " + before_date) - -# select ALL -conn.select('[Gmail]/Corbeille') - -rv, data = conn.search(None, '(BEFORE {0})'.format(before_date)) -nb_mails = str(len(data[0])) -print("Nombre de emails : " + nb_mails) - - -# deconnexion du serveur -conn.close() -conn.logout() - diff --git a/setup.py b/setup.py index f3d6425..a40bb00 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ requires = [ 'pyramid_tm', 'SQLAlchemy', 'transaction', - 'zope.sqlalchemy', + 'zope.sqlalchemy==1.1', 'waitress', 'mysqlclient', 'yfinance',