Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
K
kohinos-tav
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 1
    • Merge Requests 1
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • agplv3
  • kohinos-tav
  • Merge Requests
  • !16

Merged
Opened Dec 14, 2022 by Félicie@felicie 
  • Report abuse
Report abuse

3590-show-balance-inhabitant

  • Discussion 2
  • Commits 6
  • Changes 1
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Félicie @felicie

    added 1 commit

    • e0efb776 - balance better

    Compare with previous version

    Dec 15, 2022

    added 1 commit

    • e0efb776 - balance better

    Compare with previous version

    added 1 commit <ul><li>e0efb776 - balance better</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic/kohinos-tav/merge_requests/16/diffs?diff_id=1968&start_sha=fade839067b7006892dd5a24be916bb2bc6b454e)
    Toggle commit list
  • Damien Moulard
    @DamienM started a discussion on an old version of the diff Dec 15, 2022
    Resolved by Damien Moulard Jan 04, 2023
    src/Admin/AdherentAdmin.php
    185 187 ])
    186 188 ->end()
    187 189 ->end();
    190
    191 if (!empty($adherent) && !empty($adherent->getEmlcAccount()) ) {
    192 $em = $this->getConfigurationPool()->getContainer()->get('doctrine')->getManager();
    193 $balance = $adherent->getEmlcAccount()->getBalance();
    194 $mlc = $em->getRepository(GlobalParameter::class)->val(GlobalParameter::MLC_SYMBOL);
    195 $formMapper
    196 ->tab('General')
    197 ->with('Solde', ['class' => 'col-md-7'])
    • Damien Moulard @DamienM commented Dec 15, 2022
      Master

      Du coup là en l'état il faut scroller pour voir apparaitre la section "solde", c'est pas très ergo... Moi je le rajouterai à une autre section (je dirais à la section "Profil de cotisation")

      Du coup là en l'état il faut scroller pour voir apparaitre la section "solde", c'est pas très ergo... Moi je le rajouterai à une autre section (je dirais à la section "Profil de cotisation")
    • Félicie @felicie

      changed this line in version 3 of the diff

      Dec 15, 2022

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gl.cooperatic.fr/cooperatic/kohinos-tav/merge_requests/16/diffs?diff_id=1971&start_sha=e0efb776bfa434b014730e1b7c4db991e83baaa7#ef2be88c52e44d777fb4d25b33863ee6be1a97f5_197_197)
      Toggle commit list
    • Félicie @felicie commented Dec 15, 2022

      c'est ce que j'aurai fais aussi, mais j'ai pas encore bien compris comment fonctionne le css ? En attendant je viens de mettre un col-md-12, je me dis que c'est mieux comme ça ?

      c'est ce que j'aurai fais aussi, mais j'ai pas encore bien compris comment fonctionne le css ? En attendant je viens de mettre un `col-md-12`, je me dis que c'est mieux comme ça ?
    Please register or sign in to reply
  • Félicie @felicie

    added 1 commit

    • 1ac124f2 - may more beautiful

    Compare with previous version

    Dec 15, 2022

    added 1 commit

    • 1ac124f2 - may more beautiful

    Compare with previous version

    added 1 commit <ul><li>1ac124f2 - may more beautiful</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic/kohinos-tav/merge_requests/16/diffs?diff_id=1971&start_sha=e0efb776bfa434b014730e1b7c4db991e83baaa7)
    Toggle commit list
  • Damien Moulard @DamienM

    added 1 commit

    • 043ff4d0 - update display in adherent admin edit page

    Compare with previous version

    Jan 04, 2023

    added 1 commit

    • 043ff4d0 - update display in adherent admin edit page

    Compare with previous version

    added 1 commit <ul><li>043ff4d0 - update display in adherent admin edit page</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic/kohinos-tav/merge_requests/16/diffs?diff_id=1985&start_sha=1ac124f2575317205f4411333c87b61ca2d64957)
    Toggle commit list
  • Damien Moulard @DamienM

    resolved all discussions

    Jan 04, 2023

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Damien Moulard @DamienM

    added 34 commits

    • 043ff4d0...7e05daf3 - 33 commits from branch develop
    • 5befa416 - fix merge conflict

    Compare with previous version

    Jan 04, 2023

    added 34 commits

    • 043ff4d0...7e05daf3 - 33 commits from branch develop
    • 5befa416 - fix merge conflict

    Compare with previous version

    added 34 commits <ul><li>043ff4d0...7e05daf3 - 33 commits from branch <code>develop</code></li><li>5befa416 - fix merge conflict</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic/kohinos-tav/merge_requests/16/diffs?diff_id=1986&start_sha=043ff4d041c97097122029f64190176034c9a562)
    Toggle commit list
  • Damien Moulard @DamienM

    merged

    Jan 04, 2023

    merged

    merged
    Toggle commit list
  • Damien Moulard @DamienM

    mentioned in commit f0844afc

    Jan 04, 2023

    mentioned in commit f0844afc

    mentioned in commit f0844afc451fdda3f4cd86b7340327d3b0768669
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: agplv3/kohinos-tav!16
×

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.