DGNum/gestioCOF
15
2
Fork 2
Code Issues 79 Pull requests 21 Projects Releases 12 Packages Wiki Activity

WIP: Refactor K-Psul basket #535

Draft
delobell wants to merge 10 commits from aureplop/js_basket into aureplop/kpsul_js_refactor
pull from: aureplop/js_basket
merge into: DGNum:aureplop/kpsul_js_refactor
Conversation 16 Commits 10 Files changed 7 +763 -572
delobell commented 2017-05-18 02:16:54 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

K-Psul - Basket refactor

  • Done.

K-Psul - ArticleManager

  • "selected" property becomes a reference to an article from the data property.

ModelForest

  • Add create method (based on previous get_or_create). Direction defaults to 0.
  • Add delete method.
  • Methods find, traverse, update, delete can also take a model (class) as first
    argument. String representation of model still works.
  • Fix child linking to parent in create method.
  • Add data property "object" linked to object being represented.
  • Use class to identify objects instead of id. Allow multiple displays of same ModelForest.
  • New get_class method returns the class selector to find an object container in the DOM.
  • New get_dom method returns the DOM element from an object in the ModelForest.

ModelForest -> ForestDisplay

  • (One-way data binding) Changes on a ModelForest are directly reflected on
    listening ForestDisplay(s).
  • ArticleManager and KHistory become simpler.

Config

  • Add addcost key, shorthand for double addcost keys check.

K-Psul

  • Improve display for basket summary and previous operation.
  • Improve article autocompletion.
  • Clean js code / duplicates.
  • Some components gains chance to trigger/handle events. They are really happy.
    Eg basket amounts and summary are updated thanks to these events if the
    selected account is changed.

Formatters

  • Fixes addcost and amount display.

History

  • Fix options management (api_options were overrided and K-Psul displayed more
    than the last day history).
  • Fix data display, thanks to formatters fixes and modelforest fixes.Cancellation view
  • Fix 500 on cancel with already canceled opes/transfers.
### K-Psul - Basket refactor - Done. ### K-Psul - ArticleManager - "selected" property becomes a reference to an article from the data property. ### ModelForest - Add create method (based on previous get_or_create). Direction defaults to 0. - Add delete method. - Methods find, traverse, update, delete can also take a model (class) as first argument. String representation of model still works. - Fix child linking to parent in create method. - Add data property "object" linked to object being represented. - Use class to identify objects instead of id. Allow multiple displays of same ModelForest. - New get_class method returns the class selector to find an object container in the DOM. - New get_dom method returns the DOM element from an object in the ModelForest. ### ModelForest -> ForestDisplay - (One-way data binding) Changes on a ModelForest are directly reflected on listening ForestDisplay(s). - ArticleManager and KHistory become simpler. ### Config - Add addcost key, shorthand for double addcost keys check. ### K-Psul - Improve display for basket summary and previous operation. - Improve article autocompletion. - Clean js code / duplicates. - Some components gains chance to trigger/handle events. They are really happy. Eg basket amounts and summary are updated thanks to these events if the selected account is changed. ### Formatters - Fixes addcost and amount display. ### History - Fix options management (api_options were overrided and K-Psul displayed more than the last day history). - Fix data display, thanks to formatters fixes and modelforest fixes.Cancellation view - Fix 500 on cancel with already canceled opes/transfers.
delobell commented 2017-05-18 02:21:24 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

@lstephan Il reste des choses à faire/nettoyer, mais tu peux commencer à "t'amuser" 😉

@lstephan Il reste des choses à faire/nettoyer, mais tu peux commencer à "t'amuser" :wink:
lstephan commented 2017-05-18 02:39:59 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

Dans tous les autres cas, on mettait les modèles dans kfet.api.js ; il faudrait voir un peu comment on unifie tout ça (limite mettre les modèles dans un fichier à part ?)

Dans tous les autres cas, on mettait les modèles dans `kfet.api.js` ; il faudrait voir un peu comment on unifie tout ça (limite mettre les modèles dans un fichier à part ?)
lstephan commented 2017-05-18 03:08:27 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

Je serais plus pour mettre le - dans add_withdraw plutôt

Je serais plus pour mettre le `-` dans `add_withdraw` plutôt
delobell commented 2017-05-18 12:43:01 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

Je bouge juste les modèles pour le moment. On verra sur une autre MR pour nettoyer ça.

Je bouge juste les modèles pour le moment. On verra sur une autre MR pour nettoyer ça.
delobell commented 2017-05-18 12:51:31 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 1 commit

Compare with previous version

added 1 commit * 86a3ae3c - clean [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/231/diffs?diff_id=491&start_sha=a0503d0c53d5f4f44cd1cb50dbf19054b0fe57bb)
delobell commented 2017-05-18 21:57:36 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 5 commits

  • 86a3ae3c...ef1f00c1 - 4 commits from branch aureplop/kpsul_js_refactor
  • 8a9d6712 - Merge branch 'aureplop/kpsul_js_refactor' into aureplop/js_basket

Compare with previous version

added 5 commits * 86a3ae3c...ef1f00c1 - 4 commits from branch `aureplop/kpsul_js_refactor` * 8a9d6712 - Merge branch 'aureplop/kpsul_js_refactor' into aureplop/js_basket [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/231/diffs?diff_id=500&start_sha=86a3ae3c2fdc0cf855e7d1e3d74a2275c673068e)
delobell commented 2017-05-21 20:05:41 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 4 commits

  • 8a9d6712...c76b7293 - 2 commits from branch aureplop/kpsul_js_refactor
  • 51083f91 - Merge branch 'aureplop/kpsul_js_refactor' into aureplop/js_basket
  • eff1b7ff - Cleaning - Article autocomplete, ForestDisplay and more

Compare with previous version

added 4 commits * 8a9d6712...c76b7293 - 2 commits from branch `aureplop/kpsul_js_refactor` * 51083f91 - Merge branch 'aureplop/kpsul_js_refactor' into aureplop/js_basket * eff1b7ff - Cleaning - Article autocomplete, ForestDisplay and more [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/231/diffs?diff_id=511&start_sha=8a9d6712ee13e6e4b014d7cab4c4bde60271a7f0)
delobell commented 2017-05-21 20:50:48 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

unmarked as a Work In Progress

unmarked as a **Work In Progress**
lstephan commented 2017-05-31 02:13:15 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

Remarques générales :

  • L'affichage du panier est bizarre sur grand écran et idem pour les comptes normaux sur petit écran
  • Quand on change le nombre d'items dans le panier avec les flèches, ça désélectionne l'article
  • Problèmes d'arrondis incohérents entre le panier (et l'historique) et les UKF du compte (pour reproduire : partir de 0, compter 5€ de charge et un Loic raison)
Remarques générales : - L'affichage du panier est [bizarre](/uploads/ee3bae066ee9902d42c23a9368c1a089/Screenshot_from_2017-05-30_21-03-36.png) sur grand écran et [idem](/uploads/01f99080f6a1f152b20b3c6c3bcd405d/Screenshot_from_2017-05-30_21-04-00.png) pour les comptes normaux sur petit écran - Quand on change le nombre d'items dans le panier avec les flèches, ça désélectionne l'article - Problèmes d'arrondis incohérents entre le panier (et l'historique) et les UKF du compte (pour reproduire : partir de 0, compter 5€ de charge et un Loic raison)
delobell commented 2017-05-31 21:32:41 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 2 commits

  • 5ab7519c - ForestDisplay update node.
  • ba1eabe2 - "Fix" inconsistents amounts/balances

Compare with previous version

added 2 commits * 5ab7519c - ForestDisplay update node. * ba1eabe2 - "Fix" inconsistents amounts/balances [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/231/diffs?diff_id=519&start_sha=eff1b7ff19e04d322419b14180affaf50a08fd3d)
delobell commented 2017-05-31 21:43:56 +02:00 (Migrated from git.eleves.ens.fr)
Copy link
  • Pour l'affichage, je pense garder ça pour une autre MR spécifique de clean de l'interface de K-Psul.
  • Pour la désélection, ça devrait être bon.
  • Pour les arrondis, voila ce que ça donne maintenant (en théorie): les affichages entre le panier et l'historique sont exactement les mêmes (par opération et pour le total), ils sont fait avec des arrondis. L'historique nécessite cela à cause de l'arrondi qui a lieu lors de l'enregistrement de l'opération en python. Par exemple, (pour un COF et je parle de l'historique) la 1664 blanche affiche un montant de -23 avec l'arrondi mais -24 avec le floor, or le prix de base est -23. Ensuite, la partie "nouvelle balance" et la balance dans l'encart de compte sur K-Psul affiche le montant avec un floor (pour éviter de croire qu'un compte a assez d'argent pour acheter un item alors qu'en fait non). Une situation "absurde" que ça donne: partir d'un compte (COF) à 0, ajouter une charge de 5€ dans le panier -> total: +63, nouvelle balance: +62...
    Il s'agit d'une méthode pour réduire les "incohérences", il en existe d'autres mais y'a alors d'autres problèmes. Si vous avez d'autres idées qui vous semblent mieux, faites signe
- Pour l'affichage, je pense garder ça pour une autre MR spécifique de clean de l'interface de K-Psul. - Pour la désélection, ça devrait être bon. - Pour les arrondis, voila ce que ça donne maintenant (en théorie): les affichages entre le panier et l'historique sont exactement les mêmes (par opération et pour le total), ils sont fait avec des arrondis. L'historique nécessite cela à cause de l'arrondi qui a lieu lors de l'enregistrement de l'opération en python. Par exemple, (pour un COF et je parle de l'historique) la 1664 blanche affiche un montant de -23 avec l'arrondi mais -24 avec le floor, or le prix de base est -23. Ensuite, la partie "nouvelle balance" et la balance dans l'encart de compte sur K-Psul affiche le montant avec un floor (pour éviter de croire qu'un compte a assez d'argent pour acheter un item alors qu'en fait non). Une situation "absurde" que ça donne: partir d'un compte (COF) à 0, ajouter une charge de 5€ dans le panier -> total: +63, nouvelle balance: +62... Il s'agit d'une méthode pour réduire les "incohérences", il en existe d'autres mais y'a alors d'autres problèmes. Si vous avez d'autres idées qui vous semblent mieux, faites signe
manet commented 2017-06-04 19:45:18 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

Tiens, j'avais remarqué un problème sur la production (mais j'ai pas créé d'issue) : si tu comptes un truc, que tu le supprimes du panier, puis que tu le rajoutes à nouveau, l'affichage du panier est faux.

Tiens, j'avais remarqué un problème sur la production (mais j'ai pas créé d'issue) : si tu comptes un truc, que tu le supprimes du panier, puis que tu le rajoutes à nouveau, l'affichage du panier est faux.
lstephan commented 2017-06-25 17:56:13 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

Autres remarques :

  • le récapitulatif du panier a des espaces bizarres tant sur les petits que sur les grands écrans.

  • Je suppose que laisser la première ligne blanche était pour la cohérence avec le previous_op, mais je trouve ça plus perturbant qu'autre chose.

  • Quand on passe un item en stock bas en modifiant le nombre dans le panier (par exemple, s'il reste 7 1664 et qu'on rentre 1 puis 1 dans le panier), le warning ne s'affiche pas

Autres remarques : - le récapitulatif du panier a des espaces bizarres tant sur les [petits](/uploads/6228275aa1ffcfbe56e2cdfd51d72efe/Screenshot_from_2017-06-25_12-41-30.png) que sur les [grands](/uploads/5fb80ebfc97bb529904354fdce2fcf19/Screenshot_from_2017-06-25_12-41-59.png) écrans. - Je suppose que laisser la première ligne blanche était pour la cohérence avec le `previous_op`, mais je trouve ça plus perturbant qu'autre chose. - Quand on passe un item en stock bas en modifiant le nombre dans le panier (par exemple, s'il reste 7 1664 et qu'on rentre 1 puis 1 dans le panier), le warning ne s'affiche pas
lstephan commented 2018-01-10 19:21:19 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

added 213 commits

  • 4808650f - kfet_open is updatable
  • f87f1cef - kfetOpen bullet working
  • a828ecbc - Merge branch 'qwann/k-fet/home' into qwann/k-fet/kfet_open
  • 15b8900d - fixes dumb merge
  • 62470757 - Merge branch 'qwann/k-fet/home' into qwann/k-fet/kfet_open
  • 964dd716 - Merge branch 'qwann/k-fet/home' into qwann/k-fet/kfet_open
  • 8e462134 - home base html
  • b7040d58 - adding KFET_FORCE_CLOSE in cache
  • 392338ed - indent
  • 0f96d3bc - moving kfet_open url
  • f8e09cf2 - unknow status updated every 30s
  • ce96bc4b - Status added on home page
  • 5694e4b9 - migrations merged
  • 8e7b9e2f - force close working
  • f18bb9f3 - permission added
  • cd31c552 - permission working
  • 52dda7be - Merge branch 'qwann/k-fet/home' into qwann/k-fet/kfet_open
  • b0643c09 - typo
  • c3d740ad - Handle incomplete values from the LDAP
  • f6d43dff - exclude empty strings from ldap results
  • a5671fdf - Merge branch 'master' into qwann/k-fet/kfet_open
  • ef8fec89 - migration renamed
  • 6f66fbbf - Merge branch 'master' into Production
  • 387edd2f - Merge branch 'master' into Production
  • 531a4611 - Merge branch 'master' into qwann/k-fet/kfet_open
  • deb0d4de - moving migration again
  • e18c2c69 - new migration
  • 15873085 - small fixes
  • 5c6a73c5 - kfet_open uses moment.js
  • cb9ba76a - small fixes
  • e0b0a531 - stupidness removed
  • be8d249e - remove useless code
  • 2c408389 - Add real cache support
  • ab31c206 - missing CACHES value...
  • 36771c2c - Use redis for cache.
  • 2a3c892d - Merge branch 'master' into aureplop/fix_cache
  • 0a21858b - Use css for scroll positionning
  • ea81ab7b - Few display improvements.
  • ce23eece - Fix display on small screen devices.
  • e772d127 - Merge branch 'master' into aureplop/fix_cache
  • dbf5844f - Clean settings redis
  • 6de0844d - Merge branch 'master' into aureplop/clean_scroll
  • 739990cd - Add total boxes to new inventory view + fix/clean
  • 673dc029 - Merge branch 'master' into aureplop/fix_cache
  • e7266e7a - use new settings for redis
  • 5776c817 - Clean navbar + content_center only
  • 1a661c1f - revert
  • e9073e22 - Improve multiple select inputs
  • ae270656 - Group permissions select multiple -> checkboxes
  • 51dca32d - shorter transitions
  • ecce2fda - Merge branch 'master' into aureplop/clean_scroll
  • 0995f712 - clean hover/focus/disabled btn
  • 4344b7d5 - chrome support
  • c11c3f84 - clean big tables forms
  • c0b8430a - Better scale management for order creation
  • 109a692c - Order creation improvements.
  • 1845ce82 - jpp
  • e60e347a - Add base templates to extend
  • 17b140fb - Upgrade apt packages while provisioning
  • 76dcaf7d - drop py2 compat
  • dba8a0a8 - Remove the num field in CofProfile
  • 3762b38a - Remove useless pip upgrade in bootstrap.sh
  • a36d002b - Merge branch 'Kerl/apt_upgrade' into 'master'
  • f0f15856 - Registration: remove success var, fix message
  • 3c8f1c58 - Use transaction.atomic instead of lock_table
  • cd5a2e05 - Move K-Fêt global permissions.
  • 1d269ef4 - Update migration to keep perms.
  • 92c946a2 - Merge branch 'aureplop/clean_perms' into 'master'
  • 74135f88 - enhance User.str with get_full_name
  • 3a69c337 - Simple test: we can query the account-read page
  • 0815c96c - Merge branch 'Kerl/postgres' into 'master'
  • b13e992a - Merge branch 'aureplop/clean_scroll' into 'master'
  • ea21b076 - Add an announcement banner
  • 8c6d56b2 - Add Wagtail CMS for kfet app.
  • 5bed02c3 - Merge branch 'Kerl/banner' into 'master'
  • 6e82a2cf - minor fix
  • 0e03fc85 - The BdA receives the reminder emails
  • 2a361454 - minor PEP8 changes
  • 31c034a9 - send_rappel: use django messages + css tweaks
  • fbdfdeef - Add a link to the reminder emails sending page
  • 76c75d5c - Move bda-participant template -> bda/ folder
  • ffb777a4 - Test the "participants" views
  • 4fce1e8a - typo
  • 5c118930 - Add a link to the "bda-rappel" mail edition page
  • 1499c0bc - Improvements for K-Fêt CMS.
  • d0042879 - Merge branch 'master' into aureplop/kfet_cms
  • ec59bc2e - Merge branch 'master' into aureplop/kfet_open
  • 69aee6b8 - Move bda.get_generic_user + optimize send_rappels
  • 80f6a808 - Simplify the mails-rappel view
  • 539c32db - Merge branch 'aureplop/fix_cache' into 'master'
  • 398893b9 - Merge branch 'Kerl/mail2bda' into 'master'
  • 2381af92 - Merge branch 'master' into aureplop/kfet_open
  • b8110c11 - kfet.open
  • 782e1056 - typo
  • 98f5f0c3 - update refresh/unknown interval
  • 19847ac9 - add token check to raw_open edit view
  • 5673fabe - Better status management.
  • 815ba506 - fix for small devices
  • b49d96d1 - Merge branch 'aureplop/kfet_open' into 'master'
  • 455b730c - Merge branch 'master' into aureplop/kfet_cms
  • d30b3626 - Merge branch 'aureplop/kfet_cms' into 'master'
  • 68c1b453 - Add missing migrations
  • 878c617c - fix PermConsumerMixin
  • e13d68a1 - Ignore PyCharm's files
  • 88597e62 - More verbose secret error reporting
  • 784513b3 - Use utf8 encoding for the mysql database
  • 062f5473 - Use the right python interpreter in the cron tasks
  • 81f3d6ab - Move STATIC_ROOT in production
  • a6b0c51d - Add SERVER_EMAIL to the secrets
  • cb1d2535 - Local development settings
  • ad15c452 - Switch to nginx + postgres in vagrant
  • c9aac8a4 - [WIP] Tests for kfet views
  • bd1dace8 - Fix symlink for secret.py
  • 4075fcaa - typo
  • 73296ea2 - Setup django before launching daphne + Django
  • dae418af - Handle websockets in nginx.conf
  • 522acafb - Add python dependency for Debian9
  • 853fa57c - In README.md: typo env -> venv
  • 59231661 - Specify the full path of the sqlite database
  • 4d026407 - Quicker setup for local development
  • 4c08962e - Hide more stuff in secret.py
  • 2a519bfe - Add SCRIPT_NAME to the production-like server
  • 1d931023 - Merge branch 'Kerl/setup' into 'master'
  • 343b52f9 - Merge branch 'master' into test/views_kfet
  • 2cfce1c9 - Add tests for kfet views.
  • a3bb9852 - Merge branch 'master' into test/views
  • 414b0eb4 - Add missing perms to view/edit kfet config
  • b4b15ab3 - Tests of kfet config views pass
  • 22d8317d - Fix kfet.open.tests
  • b4338ce8 - View 'search account' should be restricted.
  • 6e140e54 - Merge branch 'aureplop/fix_perms_settings' into 'test/views_kfet'
  • afda1ba2 - Merge branch 'test/views_fix_msg' into 'test/views'
  • 0afbd577 - Merge branch 'aureplop/fix_view_account_search' into 'test/views_kfet'
  • be1e6762 - Most data of suppliers should be optionnal.
  • b7502e51 - Merge branch 'aureplop/amend_supplier_model' into 'test/views_kfet'
  • d8391e54 - Add docs to kfet TestCases
  • 5220bb75 - Merge branch 'test/views_kfet' of git.eleves.ens.fr:cof-geek/gestioCOF into test/views_kfet
  • 7d490f02 - Merge branch 'test/views' into test/views_kfet
  • 997b63d6 - More docs for kfet.tests.utils
  • af97c0cd - Improve users management on kfet TestCase, and Py34 compat
  • fb5ba5fb - Fix kfet navbar on small devices
  • 51f4bf3f - Clipper logins may be > 8 characters
  • 50432d96 - Update available promos for account creation
  • 35b352ac - Fix mistake introduced in 51f4bf3fb5
  • 439f49c3 - We ♥ hardcoding stuff…
  • 937a4857 - Merge branch 'master' into Production
  • f5812798 - Merge branch 'aureplop/fix-kfet-navbar' into 'master'
  • faed7bff - fix ?next=… on K-Fêt logout
  • 9e618878 - K-Fêt' groups edits don't remove non-kfet app permissions.
  • 368ee319 - Update CI: use postgres
  • 1921f05e - Move STATIC_ROOT in production
  • 7d16001e - Merge branch 'aureplop/fix_kfet_perms' into 'master'
  • bf61e41b - Move auth-related from 'kfet' app to 'kfet.auth'.
  • 4091185a - import LDAP_SERVER_URL in settings
  • d89ba1ef - Fix catalogue behaviour if id=0
  • 6f2652c4 - Prod quick hack for Mega export
  • 1d19d179 - Clean setup/retrieve of kfet generic account
  • e5d19811 - Clean code related to kfet password
  • 3fa7754f - KFet Backends inherit from BaseKFetBackend
  • db512a97 - In /admin: displays "given" when it's relevant
  • 11e8cb1b - Merge branch 'bdaAdminHotfix' into 'master'
  • b4245208 - Mass cleaning of kfet' authentication machinery
  • d18fb86a - Fix attribution inlines of participant in admin
  • 22413d86 - Merge branch 'aureplop/fix-attributions-admin' into 'master'
  • b73faa3b - Merge branch 'master' into Production
  • 596868f5 - plop
  • 435e211b - Add a "PEI" status + "Gratis" subscription fees
  • 57a143e0 - Merge branch 'PEI' into 'master'
  • 4d1cb3c2 - Set password for redis in CI
  • 528532cc - Merge branch 'aureplop/fix-ci'
  • 3d22a1b0 - Merge branch 'master' into test/views
  • 503b3052 - djangorestframework 3.7 breaks with Django 1.8
  • 29ef297b - try to set the redis password…
  • 116b4da1 - Merge branch 'test/views_kfet' into test/views
  • e0ab7f5f - Fix migration conflict
  • 3f6c5be7 - Upgrade python packages before testing
  • f8bb5b08 - Merge branch 'Kerl/fix-JSONField-exn' into test/views
  • 3b1d8487 - Merge branch 'aureplop/kfet-auth_backends'
  • 03deb54d - Merge branch 'Kerl/fix-JSONField-exn' into 'master'
  • f4a7e9db - Verbosity should stay calm.
  • c59bc487 - Merge branch 'test/views__' into test/views
  • 85657591 - Fix fields cleaning with unreachable items when…
  • 47e48e36 - Merge branch 'aureplop/fix-unreachable-objects-form-creation' into 'test/views'
  • b9aaea0f - Merge branch 'master' into Production
  • fccad5ed - rename root -> kfet_genericteam in fixtures
  • 46187659 - Fix tirage pk conflicts with postgres
  • cb820e14 - Merge branch 'aureplop/fix-tirage-pk-conflict' into 'test/views'
  • 8cdb4c62 - Merge branch 'master' into test/views
  • 8b1f174b - manage.py is executable
  • 8673da18 - Fix migration conflict
  • 1cc51f17 - Prevent connection to LDAP when settings is None
  • af3a7cf6 - Reapply fix to kfetauth (…) and fix tests
  • 53ef8b51 - Merge branch 'test/views'
  • 8e8e9aa0 - Fix migration history
  • a07b5308 - PetitCoursAttributionCounter defaults to 0
  • 40abe27e - EMAIL_HOST needs to be set but as a secret
  • 1a136088 - Add missing type in custommail (dev only)
  • 364648fb - Merge branch 'Kerl/cours' into 'master'
  • 1c90d067 - Make cof.settings a module
  • 895f7e06 - Delete GlobalPermissions model (migrations)
  • 19e6ddc8 - Merge branch 'aureplop/delete-kfet-globalperms' into 'master'
  • 93fa7912 - order table striped
  • 273e6374 - Pluralization in bda -> participant list
  • 36ce0380 - Merge branch 'Qwann/legibility_kfet' into 'master'
  • b0b05424 - Upgrade to Django 1.11
  • 241c77e3 - bda -- Set winner's email as Reply-to of the email…
  • 433b3f47 - Merge branch 'aureplop/1.11' into 'master'
  • 771b642a - Merge branch 'aureplop/revente-reply_to' into 'master'
  • f58f120e - py34 compat
  • 44eee9be - Merge branch 'aureplop/py34-compat' into 'master'
  • b62f0293 - Merge branch 'master' into aureplop/kpsul_js_refactor
  • f03ce351 - Merge branch 'master' into aureplop/kpsul_js_refactor
  • f93cadc1 - Merge branch 'aureplop/kpsul_js_refactor' into aureplop/js_basket

Compare with previous version

added 213 commits * 4808650f - kfet_open is updatable * f87f1cef - kfetOpen bullet working * a828ecbc - Merge branch 'qwann/k-fet/home' into qwann/k-fet/kfet_open * 15b8900d - fixes dumb merge * 62470757 - Merge branch 'qwann/k-fet/home' into qwann/k-fet/kfet_open * 964dd716 - Merge branch 'qwann/k-fet/home' into qwann/k-fet/kfet_open * 8e462134 - home base html * b7040d58 - adding KFET_FORCE_CLOSE in cache * 392338ed - indent * 0f96d3bc - moving kfet_open url * f8e09cf2 - unknow status updated every 30s * ce96bc4b - Status added on home page * 5694e4b9 - migrations merged * 8e7b9e2f - force close working * f18bb9f3 - permission added * cd31c552 - permission working * 52dda7be - Merge branch 'qwann/k-fet/home' into qwann/k-fet/kfet_open * b0643c09 - typo * c3d740ad - Handle incomplete values from the LDAP * f6d43dff - exclude empty strings from ldap results * a5671fdf - Merge branch 'master' into qwann/k-fet/kfet_open * ef8fec89 - migration renamed * 6f66fbbf - Merge branch 'master' into Production * 387edd2f - Merge branch 'master' into Production * 531a4611 - Merge branch 'master' into qwann/k-fet/kfet_open * deb0d4de - moving migration again * e18c2c69 - new migration * 15873085 - small fixes * 5c6a73c5 - kfet_open uses moment.js * cb9ba76a - small fixes * e0b0a531 - stupidness removed * be8d249e - remove useless code * 2c408389 - Add real cache support * ab31c206 - missing CACHES value... * 36771c2c - Use redis for cache. * 2a3c892d - Merge branch 'master' into aureplop/fix_cache * 0a21858b - Use css for scroll positionning * ea81ab7b - Few display improvements. * ce23eece - Fix display on small screen devices. * e772d127 - Merge branch 'master' into aureplop/fix_cache * dbf5844f - Clean settings redis * 6de0844d - Merge branch 'master' into aureplop/clean_scroll * 739990cd - Add total boxes to new inventory view + fix/clean * 673dc029 - Merge branch 'master' into aureplop/fix_cache * e7266e7a - use new settings for redis * 5776c817 - Clean navbar + content_center only * 1a661c1f - revert * e9073e22 - Improve multiple select inputs * ae270656 - Group permissions select multiple -> checkboxes * 51dca32d - shorter transitions * ecce2fda - Merge branch 'master' into aureplop/clean_scroll * 0995f712 - clean hover/focus/disabled btn * 4344b7d5 - chrome support * c11c3f84 - clean big tables forms * c0b8430a - Better scale management for order creation * 109a692c - Order creation improvements. * 1845ce82 - jpp * e60e347a - Add base templates to extend * 17b140fb - Upgrade apt packages while provisioning * 76dcaf7d - drop py2 compat * dba8a0a8 - Remove the num field in CofProfile * 3762b38a - Remove useless pip upgrade in bootstrap.sh * a36d002b - Merge branch 'Kerl/apt_upgrade' into 'master' * f0f15856 - Registration: remove success var, fix message * 3c8f1c58 - Use transaction.atomic instead of lock_table * cd5a2e05 - Move K-Fêt global permissions. * 1d269ef4 - Update migration to keep perms. * 92c946a2 - Merge branch 'aureplop/clean_perms' into 'master' * 74135f88 - enhance User.__str__ with get_full_name * 3a69c337 - Simple test: we can query the account-read page * 0815c96c - Merge branch 'Kerl/postgres' into 'master' * b13e992a - Merge branch 'aureplop/clean_scroll' into 'master' * ea21b076 - Add an announcement banner * 8c6d56b2 - Add Wagtail CMS for kfet app. * 5bed02c3 - Merge branch 'Kerl/banner' into 'master' * 6e82a2cf - minor fix * 0e03fc85 - The BdA receives the reminder emails * 2a361454 - minor PEP8 changes * 31c034a9 - send_rappel: use django messages + css tweaks * fbdfdeef - Add a link to the reminder emails sending page * 76c75d5c - Move bda-participant template -> bda/ folder * ffb777a4 - Test the "participants" views * 4fce1e8a - typo * 5c118930 - Add a link to the "bda-rappel" mail edition page * 1499c0bc - Improvements for K-Fêt CMS. * d0042879 - Merge branch 'master' into aureplop/kfet_cms * ec59bc2e - Merge branch 'master' into aureplop/kfet_open * 69aee6b8 - Move bda.get_generic_user + optimize send_rappels * 80f6a808 - Simplify the mails-rappel view * 539c32db - Merge branch 'aureplop/fix_cache' into 'master' * 398893b9 - Merge branch 'Kerl/mail2bda' into 'master' * 2381af92 - Merge branch 'master' into aureplop/kfet_open * b8110c11 - kfet.open * 782e1056 - typo * 98f5f0c3 - update refresh/unknown interval * 19847ac9 - add token check to raw_open edit view * 5673fabe - Better status management. * 815ba506 - fix for small devices * b49d96d1 - Merge branch 'aureplop/kfet_open' into 'master' * 455b730c - Merge branch 'master' into aureplop/kfet_cms * d30b3626 - Merge branch 'aureplop/kfet_cms' into 'master' * 68c1b453 - Add missing migrations * 878c617c - fix PermConsumerMixin * e13d68a1 - Ignore PyCharm's files * 88597e62 - More verbose secret error reporting * 784513b3 - Use utf8 encoding for the mysql database * 062f5473 - Use the right python interpreter in the cron tasks * 81f3d6ab - Move STATIC_ROOT in production * a6b0c51d - Add SERVER_EMAIL to the secrets * cb1d2535 - Local development settings * ad15c452 - Switch to nginx + postgres in vagrant * c9aac8a4 - [WIP] Tests for kfet views * bd1dace8 - Fix symlink for secret.py * 4075fcaa - typo * 73296ea2 - Setup django before launching daphne + Django * dae418af - Handle websockets in nginx.conf * 522acafb - Add python dependency for Debian9 * 853fa57c - In README.md: typo env -> venv * 59231661 - Specify the full path of the sqlite database * 4d026407 - Quicker setup for local development * 4c08962e - Hide more stuff in secret.py * 2a519bfe - Add SCRIPT_NAME to the production-like server * 1d931023 - Merge branch 'Kerl/setup' into 'master' * 343b52f9 - Merge branch 'master' into test/views_kfet * 2cfce1c9 - Add tests for kfet views. * a3bb9852 - Merge branch 'master' into test/views * 414b0eb4 - Add missing perms to view/edit kfet config * b4b15ab3 - Tests of kfet config views pass * 22d8317d - Fix kfet.open.tests * b4338ce8 - View 'search account' should be restricted. * 6e140e54 - Merge branch 'aureplop/fix_perms_settings' into 'test/views_kfet' * afda1ba2 - Merge branch 'test/views_fix_msg' into 'test/views' * 0afbd577 - Merge branch 'aureplop/fix_view_account_search' into 'test/views_kfet' * be1e6762 - Most data of suppliers should be optionnal. * b7502e51 - Merge branch 'aureplop/amend_supplier_model' into 'test/views_kfet' * d8391e54 - Add docs to kfet TestCases * 5220bb75 - Merge branch 'test/views_kfet' of git.eleves.ens.fr:cof-geek/gestioCOF into test/views_kfet * 7d490f02 - Merge branch 'test/views' into test/views_kfet * 997b63d6 - More docs for kfet.tests.utils * af97c0cd - Improve users management on kfet TestCase, and Py34 compat * fb5ba5fb - Fix kfet navbar on small devices * 51f4bf3f - Clipper logins may be > 8 characters * 50432d96 - Update available promos for account creation * 35b352ac - Fix mistake introduced in 51f4bf3fb5e370 * 439f49c3 - We ♥ hardcoding stuff… * 937a4857 - Merge branch 'master' into Production * f5812798 - Merge branch 'aureplop/fix-kfet-navbar' into 'master' * faed7bff - fix ?next=… on K-Fêt logout * 9e618878 - K-Fêt' groups edits don't remove non-kfet app permissions. * 368ee319 - Update CI: use postgres * 1921f05e - Move STATIC_ROOT in production * 7d16001e - Merge branch 'aureplop/fix_kfet_perms' into 'master' * bf61e41b - Move auth-related from 'kfet' app to 'kfet.auth'. * 4091185a - import LDAP_SERVER_URL in settings * d89ba1ef - Fix catalogue behaviour if id=0 * 6f2652c4 - Prod quick hack for Mega export * 1d19d179 - Clean setup/retrieve of kfet generic account * e5d19811 - Clean code related to kfet password * 3fa7754f - KFet Backends inherit from BaseKFetBackend * db512a97 - In /admin: displays "given" when it's relevant * 11e8cb1b - Merge branch 'bdaAdminHotfix' into 'master' * b4245208 - Mass cleaning of kfet' authentication machinery * d18fb86a - Fix attribution inlines of participant in admin * 22413d86 - Merge branch 'aureplop/fix-attributions-admin' into 'master' * b73faa3b - Merge branch 'master' into Production * 596868f5 - plop * 435e211b - Add a "PEI" status + "Gratis" subscription fees * 57a143e0 - Merge branch 'PEI' into 'master' * 4d1cb3c2 - Set password for redis in CI * 528532cc - Merge branch 'aureplop/fix-ci' * 3d22a1b0 - Merge branch 'master' into test/views * 503b3052 - djangorestframework 3.7 breaks with Django 1.8 * 29ef297b - try to set the redis password… * 116b4da1 - Merge branch 'test/views_kfet' into test/views * e0ab7f5f - Fix migration conflict * 3f6c5be7 - Upgrade python packages before testing * f8bb5b08 - Merge branch 'Kerl/fix-JSONField-exn' into test/views * 3b1d8487 - Merge branch 'aureplop/kfet-auth_backends' * 03deb54d - Merge branch 'Kerl/fix-JSONField-exn' into 'master' * f4a7e9db - Verbosity should stay calm. * c59bc487 - Merge branch 'test/views__' into test/views * 85657591 - Fix fields cleaning with unreachable items when… * 47e48e36 - Merge branch 'aureplop/fix-unreachable-objects-form-creation' into 'test/views' * b9aaea0f - Merge branch 'master' into Production * fccad5ed - rename root -> kfet_genericteam in fixtures * 46187659 - Fix tirage pk conflicts with postgres * cb820e14 - Merge branch 'aureplop/fix-tirage-pk-conflict' into 'test/views' * 8cdb4c62 - Merge branch 'master' into test/views * 8b1f174b - manage.py is executable * 8673da18 - Fix migration conflict * 1cc51f17 - Prevent connection to LDAP when settings is None * af3a7cf6 - Reapply fix to kfetauth (…) and fix tests * 53ef8b51 - Merge branch 'test/views' * 8e8e9aa0 - Fix migration history * a07b5308 - PetitCoursAttributionCounter defaults to 0 * 40abe27e - EMAIL_HOST needs to be set but as a secret * 1a136088 - Add missing type in custommail (dev only) * 364648fb - Merge branch 'Kerl/cours' into 'master' * 1c90d067 - Make cof.settings a module * 895f7e06 - Delete GlobalPermissions model (migrations) * 19e6ddc8 - Merge branch 'aureplop/delete-kfet-globalperms' into 'master' * 93fa7912 - order table striped * 273e6374 - Pluralization in bda -> participant list * 36ce0380 - Merge branch 'Qwann/legibility_kfet' into 'master' * b0b05424 - Upgrade to Django 1.11 * 241c77e3 - bda -- Set winner's email as Reply-to of the email… * 433b3f47 - Merge branch 'aureplop/1.11' into 'master' * 771b642a - Merge branch 'aureplop/revente-reply_to' into 'master' * f58f120e - py34 compat * 44eee9be - Merge branch 'aureplop/py34-compat' into 'master' * b62f0293 - Merge branch 'master' into aureplop/kpsul_js_refactor * f03ce351 - Merge branch 'master' into aureplop/kpsul_js_refactor * f93cadc1 - Merge branch 'aureplop/kpsul_js_refactor' into aureplop/js_basket [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/231/diffs?diff_id=735&start_sha=ba1eabe2400775370b1e302a8d1c2e6602f7b0dd)
lstephan commented 2018-01-10 19:21:20 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

marked as a Work In Progress from c9aac8a49d

marked as a **Work In Progress** from c9aac8a49dec92e31a1220fc700f65c6b82fdbcc
delobell commented 2018-01-15 17:20:02 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

added 3 commits

  • 5ef219c8 - 1 commit from branch aureplop/kpsul_js_refactor
  • 367b5899 - Merge branch 'aureplop/kpsul_js_refactor' into aureplop/js_basket
  • 5aa2d3cb - kfet.kpsul -- Make the low-stock indicator appear…

Compare with previous version

added 3 commits * 5ef219c8 - 1 commit from branch `aureplop/kpsul_js_refactor` * 367b5899 - Merge branch 'aureplop/kpsul_js_refactor' into aureplop/js_basket * 5aa2d3cb - kfet.kpsul -- Make the low-stock indicator appear… [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/231/diffs?diff_id=746&start_sha=f93cadc12cd3ca54d990cb1c4ad374b240f49b1f)
This pull request is marked as a work in progress.
View command line instructions

Checkout

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

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout aureplop/kpsul_js_refactor
git merge --no-ff aureplop/js_basket
git checkout aureplop/js_basket
git rebase aureplop/kpsul_js_refactor
git checkout aureplop/kpsul_js_refactor
git merge --ff-only aureplop/js_basket
git checkout aureplop/js_basket
git rebase aureplop/kpsul_js_refactor
git checkout aureplop/kpsul_js_refactor
git merge --no-ff aureplop/js_basket
git checkout aureplop/kpsul_js_refactor
git merge --squash aureplop/js_basket
git checkout aureplop/kpsul_js_refactor
git merge --ff-only aureplop/js_basket
git checkout aureplop/kpsul_js_refactor
git merge aureplop/js_basket
git push origin aureplop/kpsul_js_refactor
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é

  
bug

Something is not working

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
invalid

Something is wrong

  
question

More information is needed

  
wontfix

This won't be fixed

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
bug
duplicate
enhancement
help wanted
invalid
question
wontfix
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#535
No description provided.
Delete branch "aureplop/js_basket"

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?