DGNum/gestioCOF
14
2
Fork 1
Code Issues 78 Pull requests 14 Projects Releases 12 Packages Wiki Activity

WIP: Aureplop/kpsul js refactor #501

Draft
delobell wants to merge 215 commits from aureplop/kpsul_js_refactor into master
pull from: aureplop/kpsul_js_refactor
merge into: DGNum:master
Conversation 55 Commits 215 Files changed 19 +3898 -1843
delobell commented 2017-03-24 20:45:19 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Fixes #77, #89, #108, #144.

Fixes #77, #89, #108, #144.
delobell commented 2017-03-24 20:46:16 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

added ~28 ~27 ~25 labels

added ~28 ~27 ~25 labels
lstephan commented 2017-03-24 21:03:59 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Pourquoi ne pas laisser ça au Formatter ?

Pourquoi ne pas laisser ça au `Formatter` ?
lstephan commented 2017-03-24 21:07:33 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Perso, je préfère var prop of props, ça évite d'itérer sur des trucs inattendus

Perso, je préfère `var prop of props`, ça évite d'itérer sur des trucs inattendus
delobell commented 2017-03-24 21:07:34 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

On peut vouloir utiliser cette valeur. Le Formatter ne sert qu'a définir l'affichage

On peut vouloir utiliser cette valeur. Le `Formatter` ne sert qu'a définir l'affichage
delobell commented 2017-03-24 21:09:59 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Ah oui tout à fait

Ah oui tout à fait
lstephan commented 2017-03-24 21:14:47 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Justement, ça me paraissait plus en accord avec le prédicat 'backend en euros, frontend en UKF' ; mais je comprends la position inverse.

Justement, ça me paraissait plus en accord avec le prédicat 'backend en euros, frontend en UKF' ; mais je comprends la position inverse.
delobell commented 2017-03-24 21:14:47 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Ah mais en fait non y'avait une raison.
props (et attrs après) sont des tableaux et le var in s'utilisent donc de cette manière.

Ah mais en fait non y'avait une raison. `props` (et `attrs` après) sont des tableaux et le `var in` s'utilisent donc de cette manière.
lstephan commented 2017-03-24 21:15:14 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

(voire même let prop of props si on veut pinailler sur la portée)

(voire même `let prop of props` si on veut pinailler sur la portée)
lstephan commented 2017-03-24 21:17:05 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Justement, c'est fait pour ça il me semble : https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Statements/for...of

Dans le cas for ... in, si tu crées une fonction sur Array.prototype tu vas itérer dessus aussi.

Justement, c'est fait pour ça il me semble : https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Statements/for...of Dans le cas `for ... in`, si tu crées une fonction sur `Array.prototype` tu vas itérer dessus aussi.
delobell commented 2017-03-24 21:20:10 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Ah oui bien vu

Ah oui bien vu
lstephan commented 2017-03-24 21:23:08 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Il faut une URL django-reverse ici

Il faut une URL `django-reverse` ici
delobell commented 2017-03-24 21:24:17 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

added 1 commit

Compare with previous version

added 1 commit * a9d1a6aa - clean array iteration [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/197/diffs?diff_id=266&start_sha=a9cb50b38dfc4c711777d1774257670e2cc728b2)
lstephan commented 2017-03-24 21:25:38 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Il va y avoir le même problème de coupure des résultats, le fix est ici.

Il va y avoir le même problème de coupure des résultats, le fix est [ici](https://git.eleves.ens.fr/cof-geek/gestioCOF/blob/aa247b465aff08afa2a7d582211f214cba38900f/kfet/templates/kfet/kpsul.html#L291).
delobell commented 2017-03-24 21:28:41 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

added 1 commit

Compare with previous version

added 1 commit * abce961d - use django-js-reverse [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/197/diffs?diff_id=267&start_sha=a9d1a6aae928d6839b5becce73e39d2d9658fde1)
lstephan commented 2017-03-24 21:30:18 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Apparemment selon cette page on détruit la compatibilité avec pas mal de trucs ici.

Apparemment selon [cette page](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Array_comprehensions) on détruit la compatibilité avec pas mal de trucs ici.
lstephan commented 2017-03-24 21:32:53 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

by contient l'id du compte, pas son trigramme.

`by` contient l'id du compte, pas son trigramme.
lstephan commented 2017-03-24 21:40:28 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Il manque ()

Il manque `()`
delobell commented 2017-03-24 21:41:10 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Ouais j'ai vu ça...

Ouais j'ai vu ça...
lstephan commented 2017-03-24 21:47:11 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Ces fonctions seraient peut-être mieux dans kfet.js.

Ces fonctions seraient peut-être mieux dans `kfet.js`.
lstephan commented 2017-03-24 21:52:48 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

NB : cette suppression casse (au moins) transfers/new

NB : cette suppression casse (au moins) `transfers/new`
lstephan commented 2017-03-25 04:02:37 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

2 choses :

  • Dans le K-Psul actuel, il me semble que ça pointe vers kfet.account.read
  • Si tu veux pointer sur read, tu peux utiliser Account.url_object_for qui fait exactement la même chose.
2 choses : - Dans le K-Psul actuel, il me semble que ça pointe vers `kfet.account.read` - Si tu veux pointer sur `read`, tu peux utiliser `Account.url_object_for` qui fait exactement la même chose.
lstephan commented 2017-03-25 04:06:12 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

C'est peut-être temporaire, mais tes constructeurs ne prennent pas d'arguments (puisqu'on utilise kpsul en variable globale)

C'est peut-être temporaire, mais tes constructeurs ne prennent pas d'arguments (puisqu'on utilise `kpsul` en variable globale)
delobell commented 2017-03-25 09:24:06 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Je comprends la position inverse aussi. Mais on commence aussi à être dans le frontend ici.

Je comprends la position inverse aussi. Mais on commence aussi à être dans le frontend ici.
delobell commented 2017-03-25 09:52:46 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Et grep -rnw -e "kfet.account.read.json" ne donne que l'utilisation que tu cites.

Et `grep -rnw -e "kfet.account.read.json"` ne donne que l'utilisation que tu cites.
delobell commented 2017-03-25 10:00:15 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Vu que le compte est là, this.account.url_object fonctionne aussi.

Vu que le compte est là, `this.account.url_object` fonctionne aussi.
delobell commented 2017-03-25 10:02:46 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Je crois qu'ils servent à se filer l'environnement entre eux pour le moment. Mais effectivement, c'est bien de le noter qq part.

Je crois qu'ils servent à se filer l'environnement entre eux pour le moment. Mais effectivement, c'est bien de le noter qq part.
delobell commented 2017-03-25 10:09:09 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

En fait je doute du bien-fondé de l'utilisation de model_to_dict, qui a pas l'air d'être documentée publiquement sur Django.
Pour le moment, je fix ça rapidement.

En fait je doute du bien-fondé de l'utilisation de `model_to_dict`, qui a pas l'air d'être documentée publiquement sur Django. Pour le moment, je fix ça rapidement.
delobell commented 2017-03-25 10:27:02 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

added 6 commits

Compare with previous version

added 6 commits * 2e3bd5bd - fix search box * 0d02d47d - move utils functions * ac18cbd9 - fix by on last statement * 72970c6b - Fix api call on new transfers * 967748de - details link to read instead of update * 6afbcb44 - delete array comprehesion [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/197/diffs?diff_id=272&start_sha=abce961d9184e490d8b27b4a05af8aaedee2f586)
lstephan commented 2017-03-25 17:25:05 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Il faudrait un return ici pour être cohérent avec formatter.render.

Il faudrait un `return` ici pour être cohérent avec `formatter.render`.
lstephan commented 2017-03-25 17:25:41 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Je ne sais pas si c'est important, mais il manque un ;

Je ne sais pas si c'est important, mais il manque un `;`
lstephan commented 2017-03-26 01:42:49 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

J'ai deux erreurs account_manager is not defined et checkout_container is not defined si j'essaie d'ajouter une majoration, et la même erreur pour account_manager si je veux compter une conso avec majoration active.

J'ai deux erreurs `account_manager is not defined` et `checkout_container is not defined` si j'essaie d'ajouter une majoration, et la même erreur pour `account_manager` si je veux compter une conso avec majoration active.
lstephan commented 2017-03-26 01:46:55 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Et apparemment la majoration ne persiste pas après une actualisation, et les consos comptées avec majoration active n'apparaissent pas comme majorées dans l'historique.

Et apparemment la majoration ne persiste pas après une actualisation, et les consos comptées avec majoration active n'apparaissent pas comme majorées dans l'historique.
lstephan commented 2017-03-26 05:36:25 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

Remarques sur les imports :

  • kfet.js est déjà importé dans base.html donc ça fait un double import si on le remet dans le template
  • vu que kfet.js est importé partout et utilise Config, il râle quand on importe pas kfet.api.js
Remarques sur les imports : - `kfet.js` est déjà importé dans `base.html` donc ça fait un double import si on le remet dans le template - vu que `kfet.js` est importé partout et utilise `Config`, il râle quand on importe pas `kfet.api.js`
lstephan commented 2017-03-26 05:38:01 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

Accessoirement, il reste (entre autres dans account_read et history des utilisations de settings qui ne passent pas par Config.

Accessoirement, il reste (entre autres dans `account_read` et `history` des utilisations de `settings` qui ne passent pas par `Config`.
delobell commented 2017-03-26 15:12:17 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 5 commits

  • 485ae86a - add update method to ModelObject
  • b81b33c0 - allow chaining on container in display method
  • 24f72ae7 - add missing ;
  • bc6ecda0 - fix addcost kspul
  • 842f2cec - fix import, fix ope with addcost enabled, move Config location

Compare with previous version

added 5 commits * 485ae86a - add update method to ModelObject * b81b33c0 - allow chaining on container in display method * 24f72ae7 - add missing ; * bc6ecda0 - fix addcost kspul * 842f2cec - fix import, fix ope with addcost enabled, move Config location [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/197/diffs?diff_id=278&start_sha=6afbcb44a1e04277e00202eeab0c9d936eeb8194)
delobell commented 2017-04-03 23:26:01 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 15 commits

  • 6be2f086 - Add generic functions for confirm dialogs
  • 87943ea7 - Adapt kpsul to new functions
  • dbcfc6df - Remove duplicate kfet.js import
  • 3f07bf56 - Remove console log
  • 3bf7a066 - Adapt history.html to new functions
  • 6d92df41 - Merge branch 'aureplop/kpsul_js_refactor' of git.eleves.ens.fr:cof-geek/gestioCO…
  • c1f70d9d - Add capslock support for inputs
  • 5101400f - Use callback_as_dict for addcost
  • 08c752f1 - Simplify addcost management
  • 582cdeba - Better callback management
  • 236dcb46 - Tweaks to UserDialog
  • 29836fd1 - Remove deprecated option
  • 4af25621 - More clarity in argument names
  • 50200371 - api_lock inside kfet.js
  • dcda67aa - Merge branch 'Aufinal/dialog_utils' into 'aureplop/kpsul_js_refactor'

Compare with previous version

added 15 commits * 6be2f086 - Add generic functions for confirm dialogs * 87943ea7 - Adapt kpsul to new functions * dbcfc6df - Remove duplicate kfet.js import * 3f07bf56 - Remove console log * 3bf7a066 - Adapt history.html to new functions * 6d92df41 - Merge branch 'aureplop/kpsul_js_refactor' of git.eleves.ens.fr:cof-geek/gestioCO… * c1f70d9d - Add capslock support for inputs * 5101400f - Use callback_as_dict for addcost * 08c752f1 - Simplify addcost management * 582cdeba - Better callback management * 236dcb46 - Tweaks to UserDialog * 29836fd1 - Remove deprecated option * 4af25621 - More clarity in argument names * 50200371 - api_lock inside kfet.js * dcda67aa - Merge branch 'Aufinal/dialog_utils' into 'aureplop/kpsul_js_refactor' [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/197/diffs?diff_id=342&start_sha=842f2cecc1f6cd89314fc381b4a3563d34fdf0a0)
delobell commented 2017-04-04 00:52:26 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 320 commits

  • dcda67aa...b3418db3 - 319 commits from branch master
  • 9d2298a0 - Merge branch 'master' into aureplop/kpsul_js_refactor

Compare with previous version

added 320 commits * dcda67aa...b3418db3 - 319 commits from branch `master` * 9d2298a0 - Merge branch 'master' into aureplop/kpsul_js_refactor [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/197/diffs?diff_id=344&start_sha=dcda67aaf71cd41bc1d104f0097c581d8549e25d)
lstephan commented 2017-04-05 01:16:00 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

Il faudrait peut-être rajouter un argument always en plus de on_success et on_error

Il faudrait peut-être rajouter un argument `always` en plus de `on_success` et `on_error`
delobell commented 2017-04-05 04:30:40 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 4 commits

  • efbcde16 - clean some js
  • f1aaad73 - Better jquery ajax calls management
  • 6be6202b - few cleans
  • 6bb9280b - Merge branch 'aureplop/clean_js' into 'aureplop/kpsul_js_refactor'

Compare with previous version

added 4 commits * efbcde16 - clean some js * f1aaad73 - Better jquery ajax calls management * 6be6202b - few cleans * 6bb9280b - Merge branch 'aureplop/clean_js' into 'aureplop/kpsul_js_refactor' [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/197/diffs?diff_id=367&start_sha=9d2298a0891289fbce32255e01a72a9f0719a132)
delobell commented 2017-04-05 12:09:15 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

Fix par f1aaad73

Fix par f1aaad73
delobell commented 2017-04-05 13:18:16 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 1 commit

  • 2e0de754 - kpsul - fix account balance ukf

Compare with previous version

added 1 commit * 2e0de754 - kpsul - fix account balance ukf [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/197/diffs?diff_id=368&start_sha=6bb9280b0d12ea5f67e7839fbc28bfca3b249fba)
delobell commented 2017-04-05 17:56:17 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 43 commits

  • 64350326 - add Article and Category models
  • db9c14f7 - articlelist wip
  • 2cc0e0cf - modellist suite et fin
  • c9cce5b1 - remove temp file
  • d5dfd5fa - move ModelList def
  • a05a0759 - apimodellist & articlelist
  • fe8e5d7e - move and adapt manager and completion
  • c9b76832 - articlelist and modellist finished
  • 8aa4fa2d - modify article API return
  • e1abff22 - last tweaks
  • 02485afd - doc and compare function
  • 0219d998 - model tree struct draft
  • 1570d9f4 - Polish ModelForest class
  • fe6823fc - Adapt article_data return value to ModelTree standards
  • 08d1521d - Adapt ArticleManagerto new API
  • 3d760794 - Add correct syntax to category data
  • 770c185b - Modify sort in ModelTree
  • 2ce96bce - Add traverse function to ModelTree
  • 01295d46 - Adapt ArticleAutocomplete to new format
  • f0a80561 - Add article display to Config callback
  • 1c5ac561 - Change article table into divs
  • 91f14ded - last tweaks and doc
  • 9ab2a114 - Finish adapting ArticleManager and Autocomplete
  • a7de396a - Better comparison control
  • 565a0543 - Add support for low stock css
  • fc3e86ae - Add websocket support to ArticleManager
  • 3465dd70 - Change node.type to node.modelname for clarity
  • 5ff8f69b - Merge branch 'aureplop/kpsul_js_refactor' of git.eleves.ens.fr:cof-geek/gestioCO…
  • 7d93d91a - Merge remote-tracking branch 'origin/aureplop/kpsul_js_refactor' into Aufinal/refactor_articles
  • b91edc9c - Merge remote-tracking branch 'origin/aureplop/kpsul_js_refactor' into Aufinal/refactor_articles
  • 3ce4dc5c - Add article stock management
  • 05156f37 - Update addExistingPurchase
  • e5791efe - Remove last traces of old articles
  • cb28b928 - Remove articleSelect from _env
  • 021937a3 - Small bugfixes
  • 9c559d9e - Add articles reset to kpsul.reset
  • 3b9affb3 - Add focus methods
  • a29de134 - Move focus ; move is_low_stock to method
  • 840010b6 - Merge remote-tracking branch 'origin/aureplop/kpsul_js_refactor' into Aufinal/refactor_articles
  • 1761c5f1 - Change fromAPI logic
  • 508e7ec2 - Change traverse and find behavior
  • 5c422e89 - Add children fo traverse callback
  • 6a8f4184 - Merge branch 'Aufinal/refactor_articles' into 'aureplop/kpsul_js_refactor'

Compare with previous version

added 43 commits * 64350326 - add Article and Category models * db9c14f7 - articlelist wip * 2cc0e0cf - modellist suite et fin * c9cce5b1 - remove temp file * d5dfd5fa - move ModelList def * a05a0759 - apimodellist & articlelist * fe8e5d7e - move and adapt manager and completion * c9b76832 - articlelist and modellist finished * 8aa4fa2d - modify article API return * e1abff22 - last tweaks * 02485afd - doc and compare function * 0219d998 - model tree struct draft * 1570d9f4 - Polish ModelForest class * fe6823fc - Adapt article_data return value to ModelTree standards * 08d1521d - Adapt ArticleManagerto new API * 3d760794 - Add correct syntax to category data * 770c185b - Modify sort in ModelTree * 2ce96bce - Add traverse function to ModelTree * 01295d46 - Adapt ArticleAutocomplete to new format * f0a80561 - Add article display to Config callback * 1c5ac561 - Change article table into divs * 91f14ded - last tweaks and doc * 9ab2a114 - Finish adapting ArticleManager and Autocomplete * a7de396a - Better comparison control * 565a0543 - Add support for low stock css * fc3e86ae - Add websocket support to ArticleManager * 3465dd70 - Change node.type to node.modelname for clarity * 5ff8f69b - Merge branch 'aureplop/kpsul_js_refactor' of git.eleves.ens.fr:cof-geek/gestioCO… * 7d93d91a - Merge remote-tracking branch 'origin/aureplop/kpsul_js_refactor' into Aufinal/refactor_articles * b91edc9c - Merge remote-tracking branch 'origin/aureplop/kpsul_js_refactor' into Aufinal/refactor_articles * 3ce4dc5c - Add article stock management * 05156f37 - Update addExistingPurchase * e5791efe - Remove last traces of old articles * cb28b928 - Remove articleSelect from _env * 021937a3 - Small bugfixes * 9c559d9e - Add articles reset to kpsul.reset * 3b9affb3 - Add focus methods * a29de134 - Move focus ; move is_low_stock to method * 840010b6 - Merge remote-tracking branch 'origin/aureplop/kpsul_js_refactor' into Aufinal/refactor_articles * 1761c5f1 - Change fromAPI logic * 508e7ec2 - Change traverse and find behavior * 5c422e89 - Add children fo traverse callback * 6a8f4184 - Merge branch 'Aufinal/refactor_articles' into 'aureplop/kpsul_js_refactor' [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/197/diffs?diff_id=378&start_sha=2e0de75471a53c799d5c8153177eef7c40225c8d)
delobell commented 2017-04-05 23:38:26 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 61 commits

  • 6a8f4184...ebf948d0 - 59 commits from branch master
  • e4ccd88d - Merge branch 'master' into aureplop/kpsul_js_refactor
  • e4dd4346 - no longer use model_to_dict

Compare with previous version

added 61 commits * 6a8f4184...ebf948d0 - 59 commits from branch `master` * e4ccd88d - Merge branch 'master' into aureplop/kpsul_js_refactor * e4dd4346 - no longer use model_to_dict [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/197/diffs?diff_id=386&start_sha=6a8f41849b8a15ce6e3bcafddd9c942f7fcc7753)
delobell commented 2017-04-09 21:28:22 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 7 commits

  • df47beda - Change ModelForest inner structure
  • 23d19545 - Add back root_sort
  • 9ba13a81 - Adapt add_to_container + small improvements
  • 73fb3c41 - Add stop check in traverse
  • 9ad208a1 - Change child sort + bugfix grom prev commit
  • 323f019c - Check if children is non empty
  • 7fc07ac6 - Merge branch 'Aufinal/clean_modelforest' into 'aureplop/kpsul_js_refactor'

Compare with previous version

added 7 commits * df47beda - Change ModelForest inner structure * 23d19545 - Add back root_sort * 9ba13a81 - Adapt add_to_container + small improvements * 73fb3c41 - Add stop check in traverse * 9ad208a1 - Change child sort + bugfix grom prev commit * 323f019c - Check if children is non empty * 7fc07ac6 - Merge branch 'Aufinal/clean_modelforest' into 'aureplop/kpsul_js_refactor' [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/197/diffs?diff_id=415&start_sha=e4dd434608582abec7db43f968866b54d0c9f96e)
delobell commented 2017-04-10 13:08:40 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 15 commits

  • 7fc07ac6...15861824 - 14 commits from branch master
  • c75b2946 - Merge branch 'master' into aureplop/kpsul_js_refactor

Compare with previous version

added 15 commits * 7fc07ac6...15861824 - 14 commits from branch `master` * c75b2946 - Merge branch 'master' into aureplop/kpsul_js_refactor [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/197/diffs?diff_id=420&start_sha=7fc07ac603d8716b81b283bdffb9191c425e824c)
delobell commented 2017-04-14 16:32:11 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 23 commits

  • c75b2946...55b509b3 - 22 commits from branch master
  • b0d35667 - Merge branch 'master' into aureplop/kpsul_js_refactor

Compare with previous version

added 23 commits * c75b2946...55b509b3 - 22 commits from branch `master` * b0d35667 - Merge branch 'master' into aureplop/kpsul_js_refactor [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/197/diffs?diff_id=437&start_sha=c75b2946e334a6e20f83ab1e09f7d6ee46a7aa46)
delobell commented 2017-05-16 10:48:48 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 106 commits

  • 971848cb - database lookups
  • 5a354c61 - fetch transfers as well
  • f747c0c3 - print transfers (BROKEN)
  • 027bc2e9 - Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/transferts_historique
  • ac035638 - add css for transfers
  • 36edc334 - add transfer information
  • b0a21119 - Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/transferts_historique
  • b3b49d57 - Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/transferts_historique
  • 85af7fe4 - filter on id
  • 0b61a48c - fix selection
  • 2c2da60e - send data for cancel
  • 49bef61e - filter transfers frop opes
  • 66304359 - unite cancel_ope and cancel_transfer
  • 1dbbad38 - transfer cancellation html
  • 3f35dc2c - unite transfer history
  • a9e1cd01 - add transfersonly option
  • ee54b366 - minor imprevements to history
  • e52c4458 - pluralize function
  • f06a732d - remove unnecessary function
  • 8895daff - Merge branch 'Aufinal/transferts_historique' of git.eleves.ens.fr:cof-geek/gesti…
  • f8aa6772 - fix socket update
  • 1ea33434 - ws update for history and transfer pages
  • 1d5e6930 - ws for transfers
  • b404c989 - pep8
  • db94a890 - remove addition of new opegroups
  • fc2de20a - use switch + move text
  • 02735642 - better pluralize
  • 48140925 - simpler string pluralizing
  • eac6c420 - day, opegroup and ope model drafts
  • 8eae3cee - adapt history view
  • 741bac88 - dummy History test class
  • ac2e773f - opelist class
  • ab6b0d52 - Merge branch 'Aufinal/transferts_historique' into Aufinal/refactor_history
  • 66beeb5b - transfer history added
  • 11603cee - Merge branch 'Aufinal/refactor_articles' into Aufinal/refactor_history
  • 53f89f53 - Merge branch 'Aufinal/refactor_articles' into Aufinal/refactor_history
  • df0ea96b - Adapt history_json return value to ModelForest standards
  • 47fe74fb - template specification
  • 58c57c6f - Add hierarchy of needed models, w/ formatters
  • b0b1fdf9 - Add jsdoc comments to history models
  • 5c9c206f - Adapt css to new canceled syntax
  • 14b92263 - Remove deprecated history functions
  • b655907b - Add history to KPsul manager
  • 34bb6805 - Add History equivalent functions
  • 644b0897 - Add websocket support for history
  • 9e905b0f - Remove kpsul dependence from history (oops)
  • 1d532616 - Fix bugs introduced by previous commit
  • b8a307b4 - Add support for kfet/history page
  • fa64a683 - Add strict mode to history.html script
  • 951932a6 - Add support and websocket to transfers.html
  • 7a000961 - Add support for account_read history
  • 66c5a695 - Improve websocket filter for special history pages
  • c99e4f26 - Move history initialisation as Config.reset callback
  • fe965875 - Merge branch 'Aufinal/refactor_articles' into Aufinal/refactor_history
  • 1fcd53d7 - Continue renaming node.type to node.modelname
  • aa6a50a6 - Simplify JS-Python interface for cancel_ops
  • 0997d850 - Merge branch 'aureplop/kpsul_js_refactor' of git.eleves.ens.fr:cof-geek/gestioCO…
  • e6735d44 - Merge branch 'Aufinal/refactor_articles' into Aufinal/refactor_history
  • a1c97618 - Fix transfer sort
  • 2774dbb5 - Merge branch 'Aufinal/refactor_articles' into Aufinal/refactor_history
  • 07290f6f - Merge branch 'Aufinal/refactor_articles' into Aufinal/refactor_history
  • a173be4f - Use api_with_auth in history
  • 20b7156e - Improve type display
  • ec9f4727 - Fix WS update functions
  • 514f1da6 - Fix SpecialOpeFormatter
  • 360c442a - Remove useless class
  • e051631a - Use WebSocket classes
  • 7ec7ed26 - Rename History class
  • 290d4ecb - Merge branch 'Aufinal/refactor_articles' into Aufinal/refactor_history
  • 8d13c0a4 - Add fetch method
  • 88f7ea94 - Move selection logic to another class
  • f57c2921 - Rename history var
  • ed0a82ed - Add no_trigramme option
  • 051231a0 - Merge remote-tracking branch 'origin/aureplop/kpsul_js_refactor' into Aufinal/refactor_history
  • 688d5bba - Adapt history to new structure
  • 5e875263 - Add index for Day objects
  • 47da80f2 - Add related objects
  • cfb39b10 - Better default options
  • 983a5578 - Add cancel_history event
  • cd0e4c6f - Allow (basic) chaining on api_with_auth
  • 84d47827 - Compatibility changes on history.js
  • ce3d8aa6 - Change event triggered when canceling opes
  • 2eba6892 - Revert "Change event triggered when canceling opes"
  • 8c02e5da - Trigger event on history itself
  • de865c61 - Move container clearing
  • 034a6614 - Tweaks on kfet.js
  • 659b2089 - Add filter to cancel_opes
  • b544d6c5 - Better alignment
  • 10068645 - Change select_related for future compatibility
  • b2a5dfd6 - Move permission check
  • 20d63513 - Merge remote-tracking branch 'origin/aureplop/kpsul_js_refactor' into Aufinal/refactor_history
  • e283439e - Create ForestDisplay class
  • 46ac82fd - Adapt history to changes
  • 5096e5f1 - Adapt ArticleManager
  • 16dbfed9 - Add chidren div in display
  • 8b8a3f8a - Update button in history
  • 31b742fd - Move ws update to respective classes
  • c12c705f - Bind ForestDisplay to initial data
  • f4cb1e2e - Add opesonly option
  • ad426872 - Fix tranfers page
  • ac33e630 - Fix addExistingPurchase + few other bugs
  • c2da055b - Remove duplicate ws updates
  • 93c8844b - typo
  • 43e77236 - Extend history options
  • 6a6fc38e - Add selection reset to cancel_opes
  • 311e0c48 - Merge branch 'Aufinal/refactor_history' into 'aureplop/kpsul_js_refactor'

Compare with previous version

added 106 commits * 971848cb - database lookups * 5a354c61 - fetch transfers as well * f747c0c3 - print transfers (BROKEN) * 027bc2e9 - Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/transferts_historique * ac035638 - add css for transfers * 36edc334 - add transfer information * b0a21119 - Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/transferts_historique * b3b49d57 - Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/transferts_historique * 85af7fe4 - filter on id * 0b61a48c - fix selection * 2c2da60e - send data for cancel * 49bef61e - filter transfers frop opes * 66304359 - unite cancel_ope and cancel_transfer * 1dbbad38 - transfer cancellation html * 3f35dc2c - unite transfer history * a9e1cd01 - add transfersonly option * ee54b366 - minor imprevements to history * e52c4458 - pluralize function * f06a732d - remove unnecessary function * 8895daff - Merge branch 'Aufinal/transferts_historique' of git.eleves.ens.fr:cof-geek/gesti… * f8aa6772 - fix socket update * 1ea33434 - ws update for history and transfer pages * 1d5e6930 - ws for transfers * b404c989 - pep8 * db94a890 - remove addition of new opegroups * fc2de20a - use switch + move text * 02735642 - better pluralize * 48140925 - simpler string pluralizing * eac6c420 - day, opegroup and ope model drafts * 8eae3cee - adapt history view * 741bac88 - dummy History test class * ac2e773f - opelist class * ab6b0d52 - Merge branch 'Aufinal/transferts_historique' into Aufinal/refactor_history * 66beeb5b - transfer history added * 11603cee - Merge branch 'Aufinal/refactor_articles' into Aufinal/refactor_history * 53f89f53 - Merge branch 'Aufinal/refactor_articles' into Aufinal/refactor_history * df0ea96b - Adapt history_json return value to ModelForest standards * 47fe74fb - template specification * 58c57c6f - Add hierarchy of needed models, w/ formatters * b0b1fdf9 - Add jsdoc comments to history models * 5c9c206f - Adapt css to new canceled syntax * 14b92263 - Remove deprecated history functions * b655907b - Add history to KPsul manager * 34bb6805 - Add History equivalent functions * 644b0897 - Add websocket support for history * 9e905b0f - Remove kpsul dependence from history (oops) * 1d532616 - Fix bugs introduced by previous commit * b8a307b4 - Add support for kfet/history page * fa64a683 - Add strict mode to history.html script * 951932a6 - Add support and websocket to transfers.html * 7a000961 - Add support for account_read history * 66c5a695 - Improve websocket filter for special history pages * c99e4f26 - Move history initialisation as Config.reset callback * fe965875 - Merge branch 'Aufinal/refactor_articles' into Aufinal/refactor_history * 1fcd53d7 - Continue renaming node.type to node.modelname * aa6a50a6 - Simplify JS-Python interface for cancel_ops * 0997d850 - Merge branch 'aureplop/kpsul_js_refactor' of git.eleves.ens.fr:cof-geek/gestioCO… * e6735d44 - Merge branch 'Aufinal/refactor_articles' into Aufinal/refactor_history * a1c97618 - Fix transfer sort * 2774dbb5 - Merge branch 'Aufinal/refactor_articles' into Aufinal/refactor_history * 07290f6f - Merge branch 'Aufinal/refactor_articles' into Aufinal/refactor_history * a173be4f - Use api_with_auth in history * 20b7156e - Improve type display * ec9f4727 - Fix WS update functions * 514f1da6 - Fix SpecialOpeFormatter * 360c442a - Remove useless class * e051631a - Use WebSocket classes * 7ec7ed26 - Rename History class * 290d4ecb - Merge branch 'Aufinal/refactor_articles' into Aufinal/refactor_history * 8d13c0a4 - Add fetch method * 88f7ea94 - Move selection logic to another class * f57c2921 - Rename history var * ed0a82ed - Add no_trigramme option * 051231a0 - Merge remote-tracking branch 'origin/aureplop/kpsul_js_refactor' into Aufinal/refactor_history * 688d5bba - Adapt history to new structure * 5e875263 - Add index for Day objects * 47da80f2 - Add related objects * cfb39b10 - Better default options * 983a5578 - Add cancel_history event * cd0e4c6f - Allow (basic) chaining on api_with_auth * 84d47827 - Compatibility changes on history.js * ce3d8aa6 - Change event triggered when canceling opes * 2eba6892 - Revert "Change event triggered when canceling opes" * 8c02e5da - Trigger event on history itself * de865c61 - Move container clearing * 034a6614 - Tweaks on kfet.js * 659b2089 - Add filter to cancel_opes * b544d6c5 - Better alignment * 10068645 - Change select_related for future compatibility * b2a5dfd6 - Move permission check * 20d63513 - Merge remote-tracking branch 'origin/aureplop/kpsul_js_refactor' into Aufinal/refactor_history * e283439e - Create ForestDisplay class * 46ac82fd - Adapt history to changes * 5096e5f1 - Adapt ArticleManager * 16dbfed9 - Add chidren div in display * 8b8a3f8a - Update button in history * 31b742fd - Move ws update to respective classes * c12c705f - Bind ForestDisplay to initial data * f4cb1e2e - Add opesonly option * ad426872 - Fix tranfers page * ac33e630 - Fix addExistingPurchase + few other bugs * c2da055b - Remove duplicate ws updates * 93c8844b - typo * 43e77236 - Extend history options * 6a6fc38e - Add selection reset to cancel_opes * 311e0c48 - Merge branch 'Aufinal/refactor_history' into 'aureplop/kpsul_js_refactor' [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/197/diffs?diff_id=479&start_sha=b0d35667b33eef27d66a53e979f59161f42d9861)
delobell commented 2017-05-16 12:28:02 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 1 commit

Compare with previous version

added 1 commit * bc71e162 - keep eslint quiet [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/197/diffs?diff_id=480&start_sha=311e0c48bd19638f07f6d812814676fb63a946e8)
delobell commented 2017-05-16 18:52:26 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 56 commits

  • bc71e162...95a8b484 - 55 commits from branch master
  • bacc0797 - Merge branch 'master' into aureplop/kpsul_js_refactor

Compare with previous version

added 56 commits * bc71e162...95a8b484 - 55 commits from branch `master` * bacc0797 - Merge branch 'master' into aureplop/kpsul_js_refactor [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/197/diffs?diff_id=481&start_sha=bc71e1628a45806ab47652dad0f825d50fe774a9)
lstephan commented 2017-05-18 03:40:08 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 4 commits

  • 02a015e6 - fix data sent to ws by perform_transfers
  • cb0c0be8 - filters on ws for khistory
  • 24b9aaae - Revert template literals use
  • ef1f00c1 - Merge branch 'aureplop/fix_ws' into 'aureplop/kpsul_js_refactor'

Compare with previous version

added 4 commits * 02a015e6 - fix data sent to ws by perform_transfers * cb0c0be8 - filters on ws for khistory * 24b9aaae - Revert template literals use * ef1f00c1 - Merge branch 'aureplop/fix_ws' into 'aureplop/kpsul_js_refactor' [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/197/diffs?diff_id=490&start_sha=bacc07977886a7552fb6fa45c5a456e32ec5e9fb)
lstephan commented 2017-05-19 21:50:37 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 2 commits

  • 914d2ca8 - Add last statement update support.
  • c76b7293 - Merge branch 'aureplop/ws_checkout' into 'aureplop/kpsul_js_refactor'

Compare with previous version

added 2 commits * 914d2ca8 - Add last statement update support. * c76b7293 - Merge branch 'aureplop/ws_checkout' into 'aureplop/kpsul_js_refactor' [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/197/diffs?diff_id=508&start_sha=ef1f00c15b6903b3c05faad304c5c5c934573946)
lstephan commented 2018-01-10 19:21:46 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

added 212 commits

  • c76b7293...44eee9be - 210 commits from branch master
  • b62f0293 - Merge branch 'master' into aureplop/kpsul_js_refactor
  • f03ce351 - Merge branch 'master' into aureplop/kpsul_js_refactor

Compare with previous version

added 212 commits * c76b7293...44eee9be - 210 commits from branch `master` * b62f0293 - Merge branch 'master' into aureplop/kpsul_js_refactor * f03ce351 - Merge branch 'master' into aureplop/kpsul_js_refactor [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/197/diffs?diff_id=737&start_sha=c76b7293202b06a443c0d21660ef1b50b4805981)
delobell commented 2018-01-15 17:19:27 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

added 1 commit

  • 5ef219c8 - kfet -- Update tests to reflect last changes + fix

Compare with previous version

added 1 commit * 5ef219c8 - kfet -- Update tests to reflect last changes + fix [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/197/diffs?diff_id=745&start_sha=f03ce35126afb93645117bebe832017948c1c3f0)
lstephan commented 2018-02-12 17:46:29 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

mentioned in issue #187

mentioned in issue #187
lstephan commented 2018-10-05 23:13:27 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 122 commits

  • 5ef219c8...e515a559 - 119 commits from branch master
  • a0bd4372 - Merge branch 'master' into aureplop/kpsul_js_refactor
  • 7e15fd2d - Fix CheckoutReadView test
  • 27d26245 - Bugfix : deep extend in history.js

Compare with previous version

added 122 commits <ul><li>5ef219c8...e515a559 - 119 commits from branch <code>master</code></li><li>a0bd4372 - Merge branch &#39;master&#39; into aureplop/kpsul_js_refactor</li><li>7e15fd2d - Fix CheckoutReadView test</li><li>27d26245 - Bugfix : deep extend in history.js</li></ul> [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/197/diffs?diff_id=963&start_sha=5ef219c88ec49f8a8310c455e62e2a3dc21787fb)
This pull request has changes conflicting with the target branch.
  • cof/settings/common.py
  • cof/urls.py
  • kfet/static/kfet/css/history.css
  • kfet/static/kfet/js/history.js
  • kfet/static/kfet/js/kfet.js
  • kfet/static/kfet/js/kpsul.js
  • kfet/templates/kfet/account_read.html
  • kfet/templates/kfet/history.html
  • kfet/templates/kfet/kpsul.html
  • kfet/templates/kfet/transfers.html
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin aureplop/kpsul_js_refactor:aureplop/kpsul_js_refactor
git checkout aureplop/kpsul_js_refactor

Merge

Merge the changes and update on Forgejo.
git checkout master
git merge --no-ff aureplop/kpsul_js_refactor
git checkout master
git merge --ff-only aureplop/kpsul_js_refactor
git checkout aureplop/kpsul_js_refactor
git rebase master
git checkout master
git merge --no-ff aureplop/kpsul_js_refactor
git checkout master
git merge --squash aureplop/kpsul_js_refactor
git checkout master
git merge --ff-only aureplop/kpsul_js_refactor
git checkout master
git merge aureplop/kpsul_js_refactor
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
devtype -- backend

Au programme : du Python, du Django...

  
devtype -- docs

   
devtype -- frontend

   
devtype -- user interface

Au programme : templating, JS, CSS...

  
difficulty -- easy

   
difficulty -- hard

Difficile et/ou risqué

  
difficulty -- normal

   
Doing

   
domain -- bda

Concerne l'application BdA

  
domain -- bds

   
domain -- cof

Concerne l'application COF

  
domain -- core

Dépendances externes, CI, linting...

  
domain -- kfet

Concerne l'application K-Fêt

  
Good first issue

   
priority -- high

Urgent quoi

  
priority -- low

   
priority -- medium

   
priority -- staff-wanted

L'équipe dirigeante du domaine en question souhaite cette fonctionnalité.

  
status -- development

En cours de développement

  
status -- discussion

Avant de coder, c'est bien de discuter

  
status -- need review

En attente de code review

  
status -- production

L'ajout/la modification est présente en production

  
status -- ready to merge

Plus qu'à merger !

  
status -- todo

Le développement devrait bientôt commencer

  
To Do

   
type -- bug

Signalement ou correction de bug

  
type -- hygiene

Tout ce qui amène à du code plus propre et un repo mieux organisé.

  
type -- improvement

Ajout/Demande d'évolution mineure d'une fonctionnalité existante

  
type -- new feature

Ajout/Demande d'une nouvelle fonctionnalité

No labels
devtype -- backend
devtype -- docs
devtype -- frontend
devtype -- user interface
difficulty -- easy
difficulty -- hard
difficulty -- normal
Doing
domain -- bda
domain -- bds
domain -- cof
domain -- core
domain -- kfet
Good first issue
priority -- high
priority -- low
priority -- medium
priority -- staff-wanted
status -- development
status -- discussion
status -- need review
status -- production
status -- ready to merge
status -- todo
To Do
type -- bug
type -- hygiene
type -- improvement
type -- new feature
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: DGNum/gestioCOF#501
No description provided.
Delete branch "aureplop/kpsul_js_refactor"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?