Commit 7a0084b8 by Félicie

remove-button

parent 468038c0
dev_cooperatic #5673_bug_calendrier_echange_service 3832-makeups-and-member-status-update 4081 4444_improve_presence_recording 4709 4778-reception-dont-get-finished-orders 4809-remove-shelf-value-col-to-reduce-server-load 4880-rapports-reception-faux 4950-douchage-appli-reception 5474-et-5462-Voir-les-rattrapages-choisis-dans-admin-bdm-et-corrige-lenteur-affichage-admin-rattrapages 5641-reception-trier-a-la-maj-prix-dans-ordre-de-pointage-quantites 6286_bug_encaissement_souscription_cheque_espece 6813-marking-parent-gone-when-unpairing-binom-does-not-unsuscribe-parent-from-shift-template 6832--certaines-absences-engendrent-une-erreur 7723-7559-change-purchase-order-workflow-django-side 7731-third-party-side-brinks-pos-export-not-working 7747-inventaire-par-article 7800-make-test-solution-work 7848-cannot-validate-qty-with-decimal-on-kg-product adaptation_supercafoutch adaptation_supercoop adaptation_supercoop_supercafoutch adpatation_chouette assistance_import_article coop_dev_necessitant_modules_bdm_odoo_modifies correctif_nb_rattrapages_creation_binome_avec_ajout_automatique_au_point_negatif dev_principale export_capital_detenu fix_bug_process_picking fusion_custom_graoucoop graoucoop_backup graoucoop_prod graoucoop_tmp hot_fix_shelf_labels_auto_print impression_etiquettes_rayons integration_lien_precommandes_dans_espace_membre lacagette_prod local_branch meal-voucher-and-label-printer-software-bug migration-v12 pour_graoucoop_prod pour_version_prod_cagette refonte_espace_membre_sc retouches_tickets_supercoop sc-setup-stock-app supercafoutch-preprod supercafoutch-prod-20221003 supercafoutch_prod ticket_4146 supercafoutch_20250120_151258 supercafoutch_20250120_150340 supercafoutch_20240909_080630 supercafoutch_20240609_115709 supercafoutch_20240212_082431 supercafoutch_20240107_181851 supercafoutch_prod_until_240107 supercafoutch-prod-20221003 supercafoutch-230911 supercafoutch-230824 supercafoutch-230823 supercafoutch-230823-the-true-one migration-v12-tag lacagette_20240310_074751 lacagette_20240107_122554 lacagette_20240107_120916 graoucoop_20240609_122614 cagette_testtag cagette-230814 cagette-230630
2 merge requests!1602505 inscription remove binome choice,!164Intégration des dév. Cooperatic pour la Cagette
Pipeline #2117 passed with stage
in 1 minute 37 seconds
...@@ -77,3 +77,16 @@ ...@@ -77,3 +77,16 @@
#associate_area{ #associate_area{
margin-bottom: 15px; margin-bottom: 15px;
} }
.remove_binome_icon {
margin-left: 5px;
}
.remove_binome_icon:hover {
color: #e62720;
}
.chosen_associate_group {
display: flex;
align-items: center;
}
\ No newline at end of file
...@@ -361,10 +361,11 @@ function modify_current_coop() { ...@@ -361,10 +361,11 @@ function modify_current_coop() {
$('#existing_member_choice').addClass('choice_active'); $('#existing_member_choice').addClass('choice_active');
var member_button = '<div>' + current_coop.parent_name + '</div>'; var member_button = '<div>' + current_coop.parent_name + '</div>';
$('.chosen_associate').html(member_button);
$('.chosen_associate_area').show(); $('.chosen_associate_area').show();
associated_old_choice = 'existing_member_choice'; associated_old_choice = 'existing_member_choice';
$(".remove_binome_icon").on("click", hide_chosen_associate)
} else { } else {
$('#new_member_choice_action').show(); $('#new_member_choice_action').show();
$('#existing_member_choice_action').hide(); $('#existing_member_choice_action').hide();
...@@ -383,6 +384,11 @@ function modify_current_coop() { ...@@ -383,6 +384,11 @@ function modify_current_coop() {
} }
ncoop_view.show(); ncoop_view.show();
} }
function hide_chosen_associate() {
$(".chosen_associate_area").hide();
}
function modify_coop_by_btn_triggered() { function modify_coop_by_btn_triggered() {
var clicked = $(this); var clicked = $(this);
var coop_id = clicked.find('div').data('id'); var coop_id = clicked.find('div').data('id');
......
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
<div > <div >
<p><i>Binôme choisi : </i></p> <p><i>Binôme choisi : </i></p>
</div> </div>
<div> <div class="chosen_associate_group">
<span class="chosen_associate"></span> <span class="chosen_associate"></span>
<i class="fas fa-times remove_binome_icon"></i> <i class="fas fa-times remove_binome_icon"></i>
</div> </div>
......
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