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

Qwann/k fet/category addcost #493

Merged
narmanli merged 0 commits from qwann/k-fet/category_addcost into master 2017-04-05 15:52:20 +02:00
Conversation 13 Commits - Files changed -
narmanli commented 2017-03-17 19:26:53 +01:00 (Migrated from git.eleves.ens.fr)
Copy link
  • add has_addcost field to ArticleCategory model
  • change peform_operation in order to check addcost
  • change frontend in order to display the good price

This MR can be reviewed comit by commit :)

* add `has_addcost` field to `ArticleCategory` model * change `peform_operation` in order to check addcost * change frontend in order to display the good price This MR can be reviewed comit by commit :)
narmanli commented 2017-03-17 19:52:17 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Added 1 commit:

Added 1 commit: * de724a2c - PEP8 for perform_operation
lstephan commented 2017-03-18 18:50:25 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Comment on fait pour changer quelles catégories ont has_addcost ?

Comment on fait pour changer quelles catégories ont `has_addcost` ?
mpepin commented 2017-03-19 21:53:10 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Je ne comprends pas bien ce article_data['5'], c'est une typo ?

Je ne comprends pas bien ce `article_data['5']`, c'est une typo ?
mpepin commented 2017-03-19 22:08:40 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Et effectivement, comme @lstephan le suggère il faudrait pouvoir éditer les catégories

Et effectivement, comme @lstephan le suggère il faudrait pouvoir éditer les catégories
narmanli commented 2017-04-04 16:41:22 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

Effectivement, c'est une typo. Javascript étant très permissif il avait tout de même compris ce que je voulais dire ^^

Effectivement, c'est une typo. Javascript étant très permissif il avait tout de même compris ce que je voulais dire ^^
narmanli commented 2017-04-04 16:41:24 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

resolved all discussions

resolved all discussions
narmanli commented 2017-04-04 16:55:49 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 1 commit

Compare with previous version

added 1 commit * 72615bf4 - small fixes [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/189/diffs?diff_id=352&start_sha=de724a2c0d85ff4eaebbb850eaffe22b292d721c)
narmanli commented 2017-04-04 21:46:53 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 2 commits

Compare with previous version

added 2 commits * ba11aa49 - categories are updatable * 73500069 - PEP8 [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/189/diffs?diff_id=356&start_sha=72615bf4007cab18199435cba7278ef65c900ac6)
delobell commented 2017-04-04 21:57:34 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

changed target branch from k-fet to master

changed target branch from `k-fet` to `master`
delobell commented 2017-04-05 14:57:44 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 274 commits

  • 73500069...fe66a6ef - 273 commits from branch master
  • 42728e58 - Merge branch 'master' into qwann/k-fet/category_addcost

Compare with previous version

added 274 commits * 73500069...fe66a6ef - 273 commits from branch `master` * 42728e58 - Merge branch 'master' into qwann/k-fet/category_addcost [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/189/diffs?diff_id=371&start_sha=7350006990cd663c9ef370c11efcc72db6e0446f)
delobell commented 2017-04-05 15:37:59 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 1 commit

  • 3ee9de93 - few improvements on article category

Compare with previous version

added 1 commit * 3ee9de93 - few improvements on article category [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/189/diffs?diff_id=372&start_sha=42728e58bec362ba892505ed3b1761338265a2cd)
delobell commented 2017-04-05 15:52:19 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

mentioned in commit ebf948d042

mentioned in commit ebf948d042f215042c6e7fc2d19aa0b2f713b989
delobell commented 2017-04-05 15:52:20 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

merged

merged
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#493
No description provided.
Delete branch "qwann/k-fet/category_addcost"

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?