ajout libelle status dans liste docs

development.ini

@@ -19,8 +19,8 @@ pyramid.includes =
     pyramid_tm
 
 
+# sqlalchemy.url = mysql://dumas_ro:dumas_RO!@localhost/bddevfac?charset=utf8
 sqlalchemy.url = mysql://phuoc:phuoc!@localhost/bddevfac?charset=utf8
-# sqlalchemy.url = mysql://phuoc:phuoc!@192.168.1.14/bddevfac?charset=utf8
 # sqlalchemy.url = mysql://phuoc:phuoc!@192.168.0.31/bddevfac?charset=utf8
 
 mondumas.admin_email = peinture-dumas@entreprise-dumas.com

mondumas.egg-info/PKG-INFO

@@ -2,10 +2,53 @@ Metadata-Version: 2.1
 Name: mondumas
 Version: 1.0
 Summary: mondumas
-Home-page: 
+Home-page: UNKNOWN
 Author: 
 Author-email: 
 License: UNKNOWN
+Description: # README #
+        
+        Cette application web permet aux collaborateurs de l'entreprise Dumas :
+        
+          - de consulter et de gérer les dossiers des clients depuis leur tablette
+          - de créer un rapport de fuite et le faire signer par le client
+        
+        Elle est développée avec les composants open source suivants :
+        
+        ## Backend
+        
+        - [Python](https://www.python.org/downloads/) 3.7
+        - [Pyramid web framework](https://trypyramid.com/) 1.10
+        - [MySQL server](https://mysql.com/) 5.7 sur Windows Server 2008 R2 Standard
+        - [Apache web server](https://apache.org/) 2.4 sur Debian GNU/Linux 9 (stretch) 
+        
+        ## Frontend
+        
+        - [Bootstrap framework](https://getbootstrap.com/) for CSS 3.3.7
+        - [Jquery](https://jquery.com/download/) for JavaScript 3.2.1
+        - Chameleon templates
+        - [FormValidation](https://formvalidation.io/) form validator 0.7.0
+        
+        ## Jquery Plugins
+        
+        - [DataTables](https://datatables.net/) 1.10.20
+        - [Fullcalendar](https://fullcalendar.io/) 3.9.0
+        - [fullcalendar Scheduler](https://fullcalendar.io/) 1.9.4
+        - [Jquery-ui et jquery-ui-themes](https://jqueryui.com/) 1.12.1
+        - [jSignature](https://willowsystems.github.io/jSignature)
+        - [less.js](http://lesscss.org/) 3.11.1
+        - [moment.js](https://momentjs.com/) with-locales.min.js
+        
+        
+        [Learn Markdown](https://bitbucket.org/tutorials/markdowndemo)
+        
+        
+        
+        0.0
+        ---
+        
+        -  Initial version
+        
 Keywords: web wsgi bfg pylons pyramid
 Platform: UNKNOWN
 Classifier: Programming Language :: Python
@@ -13,48 +56,3 @@ Classifier: Framework :: Pyramid
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: WSGI :: Application
 Provides-Extra: testing
-
-# README #
-
-Cette application web permet aux collaborateurs de l'entreprise Dumas :
-
-  - de consulter et de gérer les dossiers des clients depuis leur tablette
-  - de créer un rapport de fuite et le faire signer par le client
-
-Elle est développée avec les composants open source suivants :
-
-## Backend
-
-- [Python](https://www.python.org/downloads/) 3.7
-- [Pyramid web framework](https://trypyramid.com/) 1.10
-- [MySQL server](https://mysql.com/) 5.7 sur Windows Server 2008 R2 Standard
-- [Apache web server](https://apache.org/) 2.4 sur Debian GNU/Linux 9 (stretch) 
-
-## Frontend
-
-- [Bootstrap framework](https://getbootstrap.com/) for CSS 3.3.7
-- [Jquery](https://jquery.com/download/) for JavaScript 3.2.1
-- Chameleon templates
-- [FormValidation](https://formvalidation.io/) form validator 0.7.0
-
-## Jquery Plugins
-
-- [DataTables](https://datatables.net/) 1.10.20
-- [Fullcalendar](https://fullcalendar.io/) 3.9.0
-- [fullcalendar Scheduler](https://fullcalendar.io/) 1.9.4
-- [Jquery-ui et jquery-ui-themes](https://jqueryui.com/) 1.12.1
-- [jSignature](https://willowsystems.github.io/jSignature)
-- [less.js](http://lesscss.org/) 3.11.1
-- [moment.js](https://momentjs.com/) with-locales.min.js
-
-
-[Learn Markdown](https://bitbucket.org/tutorials/markdowndemo)
-
-
-
-0.0
----
-
--  Initial version
-
-

mondumas.egg-info/SOURCES.txt

@@ -3,7 +3,6 @@ MANIFEST.in
 README.md
 bitbucket app password.txt
 development.ini
-diff.txt
 production.ini
 pytest.ini
 setup.py

mondumas.egg-info/entry_points.txt

@@ -1,2 +1,4 @@
-[paste.app_factory]
+      [paste.app_factory]
-main = mondumas:main
+      main = mondumas:main
+      [console_scripts]
+      

mondumas.egg-info/requires.txt

@@ -1,4 +1,4 @@
-pyramid
+pyramid==1.10
 pyramid_chameleon
 pyramid_debugtoolbar
 pyramid_layout
@@ -8,7 +8,7 @@ SQLAlchemy==1.2.19
 transaction
 zope.sqlalchemy==1.1
 waitress
-mysqlclient
+mysqlclient==2.1
 docutils
 pdfkit
 python-dateutil

mondumas/models/utils.py

@@ -206,7 +206,7 @@ def update_client_dern_operation(request, societe, cd_cli, dern_operation):
         execute_query(request, query, {'societe': societe, 'cd_cli': cd_cli})
         
 def delete_client_unused(request):
-    query = "DELETE FROM clients WHERE cd_cli <> 1 AND dern_operation IS NULL AND YEAR(cree_le) < YEAR(CURRENT_DATE()) - 2;"
+    query = "DELETE FROM clients WHERE cd_cli <> 1 AND dern_operation IS NULL AND YEAR(cree_le) < YEAR(CURRENT_DATE()) - 5;"
     execute_query(request, query, {})
     
 def update_stats_delais(request, societe, date, groupe):

mondumas/templates/dossier/dossier_view.pt

@@ -209,7 +209,7 @@
 					<td>${detail.date.strftime('%d-%m-%Y')}</td>
 					<td>${detail.nomcli}</td>
 					<td class="text-right"><span tal:condition="access > 1">${layout.to_euro(detail.montant)}</span></td>
-					<td class="text-center">${detail.status}</td>
+					<td class="text-center">${detail.lib_status}</td>
 				</tr>
 			</table>
 		</div>

mondumas/views/utils.py

@@ -44,9 +44,9 @@ def batch_nuit(request):
     if TODAY.day == 1 :
         # données de + 10 ans
         until_date = date(TODAY.year - 10, TODAY.month, 1)
-        # purge_mensuelle(request, until_date)
+        purge_mensuelle(request, until_date)
-        # purge_clients(request)
+        purge_clients(request)
-        # delete_orphan_attached_files(request)
+        delete_orphan_attached_files(request)
         
     """
     # ----- MAJ STATS DELAIS de traitements des dossiers sur 1 an
@@ -243,9 +243,9 @@ def batch_test(request):
     """
     # données de + 10 ans
     until_date = date(TODAY.year - 10, TODAY.month, 1)
-    # purge_mensuelle(request, until_date)
+    purge_mensuelle(request, until_date)
     purge_clients(request)
-    # delete_orphan_attached_files(request)
+    delete_orphan_attached_files(request)
 
     # update_chantiers_delais(request, date(TODAY.year - 1, TODAY.month, 1))
     insert_log(request, 'TEST','- Fin -')

setup.py

@@ -9,7 +9,7 @@ with open(os.path.join(here, 'CHANGES.txt')) as f:
     CHANGES = f.read()
 
 requires = [
-    'pyramid',
+    'pyramid == 1.10',
     'pyramid_chameleon',
     'pyramid_debugtoolbar',
     'pyramid_layout',