Skip to content

T
third-party
Opened by  

give explanation when you add or delete makeup and display it point movements screen in odoo

{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Damien Moulard
    @DamienM started a discussion on an old version of the diff
    Resolved by Damien Moulard
    members/static/js/admin/manage_makeups.js
    151 151 const member = makeups_members.find(m => m.id == member_id);
    152 152
    153 153 openModal(
    154 `Enlever un rattrapage à ${member.name} ?`,
    154 `Enlever un rattrapage à ${member.name} ?
    155 <br><br><label>Explication : </label><input class="" type="text" id="decr-explanation">
    • Damien Moulard @DamienM commented
      Developer

      Habituellement on utilise un système de templates pour les modales, pour éviter de rajouter trop d'HTML depuis le JS.

      Par exemple tu peux voir dans templates/members/admin/manage_regular_shifts.html la div <div id="templates" style="display:none;"> qui contient différentes templates. Ensuite dans le js on récupère le contenu de la template qui nous intéresse en insérant les données dynamiques (voir manage_regular_shifts.js ligne 106 par exemple)

      Edited by Damien Moulard
    • Yvon Kerdoncuff @Yvon

      changed this line in version 2 of the diff

      changed this line in version 2 of the diff

      Toggle commit list
    Please register or sign in to reply
  • Damien Moulard @DamienM commented
    Developer

    Il faudrait je pense mettre un message par défaut si les champs ne sont pas remplis, sinon voilà ce qui s'affiche dans Odoo : image Le message par défaut pourrait être le message qu'il y avait avant.

  • Yvon Kerdoncuff @Yvon

    added 1 commit

    • d5b889ca - move html out of js and write default message and signature if none provided

    Compare with previous version

    added 1 commit

    • d5b889ca - move html out of js and write default message and signature if none provided

    Compare with previous version

    Toggle commit list
  • Yvon Kerdoncuff @Yvon commented
    Master

    Hello, merci pour tes remarques, j'ai pushé les améliorations proposées.

  • Damien Moulard
    @DamienM started a discussion on an old version of the diff
    Resolved by Damien Moulard
    members/static/js/admin/manage_makeups.js
    332 354 });
    333 355
    334 356 openModal(
    335 `Ajouter un rattrapage à ${member.name} ?`,
    357 `Ajouter un rattrapage à ${member.name} ?
    358 <br><br><label>Explication : </label><input class="" type="text" id="incr-explanation">
    Please register or sign in to reply
  • Damien Moulard
    @DamienM started a discussion on an old version of the diff
    Resolved by Damien Moulard
    members/static/js/admin/manage_makeups.js
    150 150
    151 151 const member = makeups_members.find(m => m.id == member_id);
    152 152
    153 let modal_template = $("#modal_decr_makeup_counter");
    154
    155 modal_template.find(".member_name").text(member.name);
    156
    153 157 openModal(
    154 `Enlever un rattrapage à ${member.name} ?`,
    158 modal_template.html(),
    155 159 () => {
    156 update_members_makeups([member_id], "decrement");
    160 update_members_makeups(
    161 [member_id],
    162 "decrement",
    163 ($("#decr-signature")[0].value || "pas d'explication") + ' : ' + ($("#decr-explanation")[0].value || "auteur inconnu")
    • Damien Moulard @DamienM commented
      Developer

      tu as inversé ici : #decr-signature est associé à "pas d'explication"; et #decr-explanation à "auteur inconnu"

    • Yvon Kerdoncuff @Yvon

      changed this line in version 3 of the diff

      changed this line in version 3 of the diff

      Toggle commit list
    Please register or sign in to reply
  • Damien Moulard
    @DamienM started a discussion on an old version of the diff
    Resolved by Damien Moulard
    members/static/js/admin/manage_makeups.js
    167 175
    168 176 const member = makeups_members.find(m => m.id == member_id);
    169 177
    178 let modal_template = $("#modal_incr_makeup_counter");
    179
    180 modal_template.find(".member_name").text(member.name);
    181
    170 182 openModal(
    171 `Ajouter un rattrapage à ${member.name} ?`,
    183 modal_template.html(),
    172 184 () => {
    173 update_members_makeups([member_id], "increment");
    185 update_members_makeups(
    186 [member_id],
    187 "increment",
    188 ($("#incr-signature")[0].value || "pas d'explication") + ' : ' + ($("#incr-explanation")[0].value || "auteur inconnu")
    Please register or sign in to reply
  • Damien Moulard
    @DamienM started a discussion on an old version of the diff
    Resolved by Damien Moulard
    members/static/js/admin/manage_makeups.js
    198 214 if (first_select) {
    199 215 $("#decrement_selected_members_makeups").on("click", () => {
    200 216 openModal(
    201 `Enlever un rattrapage aux membres sélectionnés ?`,
    217 $("#modal_decr_selected_makeup_counter").html(),
    202 218 () => {
    203 update_members_makeups(selected_rows, "decrement");
    219 update_members_makeups(
    220 selected_rows,
    221 "decrement",
    222 ($("#decr-signature-selected")[0].value || "pas d'explication") + ' : ' + ($("#decr-explanation-selected")[0].value || "auteur inconnu")
    Please register or sign in to reply
  • Damien Moulard
    @DamienM started a discussion on an old version of the diff
    Resolved by Damien Moulard
    members/static/js/admin/manage_makeups.js
    332 354 });
    333 355
    334 356 openModal(
    335 `Ajouter un rattrapage à ${member.name} ?`,
    357 `Ajouter un rattrapage à ${member.name} ?
    358 <br><br><label>Explication : </label><input class="" type="text" id="incr-explanation">
    359 <br><br><label>Signature : </label><input class="" type="text" id="incr-signature">`,
    336 360 () => {
    337 update_members_makeups([member.id], "increment");
    361 update_members_makeups(
    362 [member.id],
    363 "increment",
    364 $("#incr-signature")[0].value + ' : ' + $("#incr-explanation")[0].value
    Please register or sign in to reply
  • Damien Moulard @DamienM commented
    Developer

    Il y a aussi des merge conflicts. N'hésite pas à me demander si tu n'es pas sûr sur un conflit !

  • Yvon Kerdoncuff @Yvon

    added 1 commit

    • e097f04a - reverse pas d'explication and auteur inconnu and properly get rid of html in js where forgot

    Compare with previous version

    added 1 commit

    • e097f04a - reverse pas d'explication and auteur inconnu and properly get rid of html in js where forgot

    Compare with previous version

    Toggle commit list
  • Yvon Kerdoncuff @Yvon

    added 13 commits

    Compare with previous version

    added 13 commits

    Compare with previous version

    Toggle commit list
  • Yvon Kerdoncuff @Yvon commented
    Master

    Olala je fais n'imp... merci, et c'est bon pour le merge aussi. J'ai pushé.

  • Damien Moulard @DamienM

    resolved all discussions

    resolved all discussions

    Toggle commit list
  • Damien Moulard @DamienM

    merged

    merged

    Toggle commit list
  • Damien Moulard @DamienM

    mentioned in commit 90a84df1

    mentioned in commit 90a84df1

    Toggle commit list
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 to comment