154 Commits

Author SHA1 Message Date
artus40
0c887afaa3 small code cleanups 2017-08-12 13:45:21 +02:00
agerbaud
a78df69762 Ajout d'un graphique sur la fréquentation en fonction de l'heure 2017-08-10 17:28:52 +02:00
agerbaud
34e2ac1183 moved filters admin module to sidebar block in website/base.html template 2017-08-04 15:58:43 +02:00
agerbaud
d258b6e869 Customized django admin styles for better coherence with bootstrap3 2017-08-04 15:44:26 +02:00
agerbaud
a600504785 Ajout de l'affichage des derniers sujets signalés, sur le modèle des derniers sujets rencontrés 2017-08-02 13:53:31 +02:00
agerbaud
ace8167fcb added some test charts 2017-08-02 12:54:02 +02:00
agerbaud
0ffc83e056 Fixed bug when prochaine_maraude variable is empty 2017-07-20 17:35:59 +02:00
agerbaud
63a1fac94a Cleanud up unused navbar template tags, restored active state on navbar main links 2017-07-20 17:33:34 +02:00
agerbaud
850c928dd8 Updated utilisateurs:details view 2017-07-20 17:28:41 +02:00
agerbaud
7b8f977f59 Created redirection view to make "Maraudes>Compte-rendu" link working everywhere 2017-07-20 14:59:47 +02:00
agerbaud
9d95266fad Moved sidebar block menu for 'maraudes' and 'notes' inside a dropdown in navbar 2017-07-20 14:44:33 +02:00
agerbaud
db79a48a9d Merge two panels in maraudes:index template 2017-07-20 14:21:18 +02:00
artus40
be087464fc Remaster (#38)
* setup new 'statistiques' module

* added 'graphos' package and created first test graph

* put graphos in requirements, deleted local folder

* added "load_csv" management command !

* added update of premiere_rencontre field in 'load_csv' management command

* added missing urls.py file

* added 'merge' action and view

* added 'info_completed' ratio

* linked sujets:merge views inside suivi:details

* added link to maraudes:details in notes table headers, if any

* Major reorganisation, moved 'suivi' and 'sujets' to 'notes', cleanup in 'maraudes', dropping 'website' mixins (mostly useless)

* small cleanup

* worked on Maraude and Sujet lists

* corrected missing line in notes.__init__

* restored 'details' view for maraudes and sujets insie 'notes' module

* worked on 'notes': added navigation between maraude's compte-rendu, right content in details, header to list tables

* changed queryset for CompteRenduDetailsView to all notes of same date, minor layout changes

* added right content to 'details-sujet', created 'statistiques' view and update templates

* restored 'statistiques' ajax view in 'details-sujet', fixed 'merge_two' util function

* added auto-creation of FicheStatistique (plus some tests), pagination for notes in 'details-sujet'

* added error-prone cases in paginator

* fixed non-working modals, added titles

* added UpdateStatistiques capacity in CompteRenduCreate view

* fixed missing AjaxTemplateMixin for CreateSujetView, worked on compte-rendu creation scripts

* fixed MaraudeManager.all_of() for common Maraudeurs, added color hints in planning

* re-instated statistiques module link and first test page

* added FinalizeView to send a mail before finalizing compte-rendu

* Added PieChart view for FicheStatistique fields

* small style updates, added 'age' and 'genre' fields from sujets in statistiques.PieChartView

* worked on statistiques, fixed small issues in 'notes' list views

* small theme change

* removed some dead code

* fixed notes.tests, fixed statistiques.info_completed display, added filter in SujetLisView

* added some tests

* added customised admin templates

* added authenticate in CustomAuthenticatationBackend, more verbose login thanks to messages

* added django-nose for test coverage

* Corrected raising exception on first migration

On first migration, qs.exists() would previously be called and raising an Exception, sot he migrations would fail.

* Better try block

* cleaned up custom settings.py, added some overrides of django base_settings

* corrected bad dictionnary key
2017-06-11 17:16:17 +02:00
artus40
0be59a61a7 Navbar (#31)
* started workin on 'navbar' module

* changed bootstrap theme to bootswatch/Simplex

* big work on navbar logic

* starting creating menus using navbar

* converted app views to new Wepage decorator, updated navbar

* reimplemented DernieresMaraudes as a dropdown instead of ContextMixin

* reorganised static files, minor code cleanups

* turned Link.href into lazy-evaluated property

* collapsed 'navbar' module into 'website', dynamic building of ApplicationMenu subclasses

* minor cleanup

* blah blah blah

* added way to add admin/non-admin links

* minor style change : red border for active page instead of all dropdowns

* deleted file

* prepare adding removing menu templates files, being replaced by code

* essayé de généraliser le code pour les modaux bootstrap, non testé git status

* more preparation and thinking on navbar app_menus logic...

* added LinkManager and DropdownManager, getting closer...

* small fix in DropdownManager.__get__

* boosted up work: keep it simple so it can be merged fast, major layout changes

* added month filter on maraudes:liste

* added 'as_icon' filter to display boolean/null values as bootstrap icons

* remove inactive user from planning selection

* removed all unused 'menu' templates

* set up django_select2 to use static files

* small fix after review
2017-02-11 18:20:13 +01:00
artus40
288ca2cc20 corrected issue with Select2 2016-12-29 16:51:29 +01:00
artus40
7cc362668e resolved #20, modified layout on 'suivi:details' 2016-12-29 15:20:16 +01:00
artus40
5884125015 ajout de la liste des derniers sujets rencontrés dans 'suivi' 2016-12-29 14:53:58 +01:00
artus40
6c995a34db resolved #21, started new design (removing some panels :) 2016-12-29 13:52:29 +01:00
artus40
2acea0e625 cleaned up code in website, utilisateurs 2016-12-29 13:26:22 +01:00
artus40
ffe73585c6 Updated after global configuration on new git installation 2016-12-15 18:28:29 +01:00
Arthur Gerbaud
f4bb37ae63 cleaned Maraudeur model, created MaraudeurManager, created some tests 2016-12-02 12:43:07 +01:00
Arthur Gerbaud
363ca64cab Merge branch 'website'
tested branching, but best to keep it straight forward for now
2016-12-01 11:28:07 +01:00
Arthur Gerbaud
8e62392a01 adressed issues #22 #23 2016-12-01 11:21:28 +01:00
Arthur Gerbaud
6b659144c9 isolated NavBarMixin 2016-12-01 11:15:55 +01:00
Arthur Gerbaud
387fe36382 corrected issue #14 2016-11-24 11:30:35 +01:00
Arthur Gerbaud
891ef9ef63 modified website.decorators, webpage->app_config, created new configs 2016-11-19 21:46:40 +01:00
Arthur Gerbaud
f4f366f514 prepared to work on menu logic 2016-11-19 14:25:09 +01:00
Arthur Gerbaud
23d9da9a79 missing template @076780a 2016-11-19 13:36:04 +01:00
Arthur Gerbaud
076780a90f added 'table' template tags in maraudes:index 2016-11-19 13:34:54 +01:00
Arthur Gerbaud
7f08b1db23 added 'tables' template tags to display objects lists in 'maraudes' and 'sujets' 2016-11-19 13:28:36 +01:00
Arthur Gerbaud
673c620be0 updated login mechanism 2016-11-16 20:04:00 +01:00
Arthur Gerbaud
96f013041b working on #10 2016-11-15 16:47:44 +01:00
Arthur Gerbaud
b085d6295c clean up some messy code 2016-11-15 15:51:23 +01:00
Arthur Gerbaud
c5d171c2da removed confusing and useless code 2016-11-15 15:45:22 +01:00
Arthur Gerbaud
a95a2e83c5 corrected order of observations returned by CompteRendu.get_observations() 2016-11-15 15:43:19 +01:00
Arthur Gerbaud
23ca194bf7 Issue #12 2016-11-15 15:28:05 +01:00
Arthur Gerbaud
0ca1d0bf8f issue #11 2016-11-15 15:21:54 +01:00
Arthur Gerbaud
254ef97a85 made requirements.txt readable by pip 2016-11-04 10:09:09 +01:00
Arthur Gerbaud
dcb87dde49 added configuration files for easier installation 2016-11-04 10:01:01 +01:00
Arthur Gerbaud
de045e2ec6 Merge branch 'master' of github.com:artus40/maraudes_project 2016-10-06 13:29:53 +02:00
Arthur Gerbaud
14ecf5ce0f added default on 'premiere_rencontre' field for Sujet, work on #5 2016-10-06 13:29:29 +02:00
artus40
02d866ffdd Corrected comment 2016-09-19 13:21:50 +02:00
artus40
da195c33b9 copy wiki home page desc in readme 2016-09-17 10:19:13 +02:00
Arthur Gerbaud
96f3a9dd80 some template cleaning 2016-09-08 18:41:50 +02:00
Arthur Gerbaud
d37455bfeb better use of CompteRendu proxy model 2016-09-08 18:10:47 +02:00
Arthur Gerbaud
cfe0dc3f2f added missing_cr context variable on maraudes:index, small fixes 2016-09-08 17:38:00 +02:00
Arthur Gerbaud
d690ef4143 better base.html columns size 2016-09-08 11:34:38 +02:00
Arthur Gerbaud
ec7f085b8e fixed NoteMixin 2016-09-08 11:30:42 +02:00
Arthur Gerbaud
4ce0baffed small fix 2016-08-26 10:19:39 +02:00
Arthur Gerbaud
dd85cb320a added search on Sujet with django-watson 2016-08-26 10:17:59 +02:00