Commit graph

104 commits

Author SHA1 Message Date
Ludovic Stephan
53f89f53e0 Merge branch 'Aufinal/refactor_articles' into Aufinal/refactor_history 2017-03-17 12:34:48 -03:00
Ludovic Stephan
a7de396aa3 Better comparison control 2017-03-17 12:33:43 -03:00
Ludovic Stephan
11603cee69 Merge branch 'Aufinal/refactor_articles' into Aufinal/refactor_history 2017-03-17 00:19:45 -03:00
Ludovic Stephan
9ab2a11432 Finish adapting ArticleManager and Autocomplete 2017-03-16 22:26:59 -03:00
Ludovic Stephan
91f14deda1 last tweaks and doc 2017-03-16 22:26:30 -03:00
Ludovic Stephan
1c5ac561a3 Change article table into divs 2017-03-16 22:26:08 -03:00
Ludovic Stephan
01295d464d Adapt ArticleAutocomplete to new format 2017-03-16 01:22:46 -03:00
Ludovic Stephan
2ce96bce1b Add traverse function to ModelTree 2017-03-16 01:21:50 -03:00
Ludovic Stephan
770c185bd0 Modify sort in ModelTree 2017-03-16 01:21:18 -03:00
Ludovic Stephan
08d1521d81 Adapt ArticleManagerto new API 2017-03-15 22:40:06 -03:00
Ludovic Stephan
1570d9f494 Polish ModelForest class 2017-03-15 22:10:56 -03:00
Ludovic Stephan
0219d998ac model tree struct draft 2017-03-15 02:45:13 -03:00
Ludovic Stephan
66beeb5bd0 transfer history added 2017-03-11 01:41:21 -03:00
Ludovic Stephan
ab6b0d52f2 Merge branch 'Aufinal/transferts_historique' into Aufinal/refactor_history 2017-03-11 00:45:54 -03:00
Ludovic Stephan
ac2e773f9e opelist class 2017-03-10 22:09:23 -03:00
Ludovic Stephan
741bac880b dummy History test class 2017-03-10 22:09:02 -03:00
Ludovic Stephan
02485afd9b doc and compare function 2017-03-10 19:59:15 -03:00
Ludovic Stephan
eac6c42041 day, opegroup and ope model drafts 2017-03-10 19:57:36 -03:00
Ludovic Stephan
e1abff2242 last tweaks 2017-03-09 22:31:59 -03:00
Ludovic Stephan
c9b7683238 articlelist and modellist finished 2017-03-09 09:20:53 -03:00
Ludovic Stephan
fe8e5d7e46 move and adapt manager and completion 2017-03-09 09:20:23 -03:00
Ludovic Stephan
a05a075962 apimodellist & articlelist 2017-03-08 10:47:51 -03:00
Ludovic Stephan
d5dfd5fa93 move ModelList def 2017-03-07 18:36:56 -03:00
Ludovic Stephan
c9cce5b125 remove temp file 2017-03-07 17:58:10 -03:00
Ludovic Stephan
2cc0e0cffe modellist suite et fin 2017-03-07 17:57:40 -03:00
Ludovic Stephan
db9c14f768 articlelist wip 2017-03-06 02:43:48 -03:00
Ludovic Stephan
643503269e add Article and Category models 2017-03-02 06:50:47 -03:00
Aurélien Delobelle
a9cb50b38d Better k-fet js and more
JavaScript
----------
- Basic classes that can be inherited to define a new class for a
  django model in javascript.
- Formatters classes are used to render properties and attributes of
  the instances of models classes.
- New classes to handle Account, Checkout, Statement models.
- Refactor K-Psul JS (part n/m).
- Better file organization.

Views
-----
- 'kpsul.checkout_data' is cleaner. Last statement is added to the JSON
  response with GET paramater 'last_statement'.
- 'account.read.json' is merged in account.read. JSON response is sent if
  GET parametter 'format' is set to 'json'.
- Fix PEP8 of concerned views.

New requirement: django-js-reverse
----------------------------------
Used to resolve the URLs defined in the project in JavaScript.
See https://github.com/ierror/django-js-reverse
2017-02-23 22:07:38 +01:00
Aurélien Delobelle
890be9b343 refactor account k-psul js - part 1
- nouvelle classe - Account: stocke, sert et récupère les données
  associées à un compte
- nouvelle classe - AccountManager: interface pour le management de la
  partie Account de K-Psul
- nouvelle classe - AccountSearch: module de recherche d'un compte
- nouvelles classes - AccountFormatter, StandardAccountFormatter,
  LIQAccountFormatter: styles de formattage des données d'un compte

- désactive l'autocomplétion dans la recherche d'un compte
- fix #89: "Entrée" dans le champ de trigramme met le compte LIQ
2017-02-13 00:23:32 +01:00
Aurélien Delobelle
5c7a1d6874 Refactor JS Settings K-Psul
- change name: Settings -> Config
- provide interface `Config` to get/set parameters
- `Config` uses global object `window.config` to store key/value
- `Config` setters handle types
2017-02-12 13:26:02 +01:00
Aurélien Delobelle
8279bddf4e clean js k-psul
- K-Psul JavaScript uses strict-mode (when JS try to do better things,
  we should follow)
2017-02-12 06:10:17 +01:00
Ludovic Stephan
02735642f1 better pluralize 2017-02-11 21:41:09 -02:00
Ludovic Stephan
fc2de20ab8 use switch + move text 2017-02-11 21:38:07 -02:00
Ludovic Stephan
8d0f803639 Corrige l'affichage du prix
fixes #128
2017-02-06 16:42:19 -02:00
Ludovic Stephan
f8aa67721c fix socket update 2017-02-05 02:19:20 -02:00
Ludovic Stephan
8895daff6a Merge branch 'Aufinal/transferts_historique' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/transferts_historique 2017-02-04 23:22:54 -02:00
Martin Pepin
75ff77c4ec Merge branch 'Aufinal/search_account' into 'k-fet'
Popup de recherche de compte

Quand on clique sur l'icone de recherche (ou qu'on appuie sur Ctrl+F depuis la zone de saisie de trigramme) un popup apparaît pour rechercher les comptes par prénom ou par nom, en utilisant `autocomplete`.

Fix #109

See merge request !153
2017-01-25 23:58:08 +01:00
Ludovic Stephan
016989c4de search results css 2017-01-19 22:53:58 -02:00
Aurélien Delobelle
dd43f9d868 Merge branch 'Aufinal/previous_op' into 'k-fet'
Rappel de l'opération précédente sur K-Psul

Rajoute un champ d'informations sur la précédente opération validée (sur
la machine, pas sur le serveur) : valeur du panier et solde restant dans
le cas d'un utilisateur, et valeur du panier et rendus de monnaie dans
le cas d'une opération en liquide.

Fix #110

See merge request !146
2017-01-07 02:33:53 +01:00
Aurélien Delobelle
7ed9c90726 fix whitespaces 2017-01-07 01:56:33 +01:00
Ludovic Stephan
b27a2d0720 mise en valeur du trigramme 2016-12-22 01:29:40 -02:00
Ludovic Stephan
5267a8a368 add previous op recap 2016-12-22 01:13:14 -02:00
Ludovic Stephan
e52c44580f pluralize function 2016-12-11 23:23:12 -02:00
Ludovic Stephan
3f35dc2c06 unite transfer history 2016-12-11 23:21:36 -02:00
Ludovic Stephan
1dbbad38b9 transfer cancellation html 2016-12-11 21:00:42 -02:00
Ludovic Stephan
2c2da60e54 send data for cancel 2016-12-10 23:52:26 -02:00
Ludovic Stephan
b0a21119fa Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/transferts_historique 2016-12-09 01:25:40 -02:00
Ludovic Stephan
cc94785fdf Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/arrondi_ukf 2016-12-09 01:25:02 -02:00
Ludovic Stephan
36edc334d4 add transfer information 2016-12-09 00:26:25 -02:00
Ludovic Stephan
ac0356386a add css for transfers 2016-12-09 00:26:07 -02:00