Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
third-party
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
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cooperatic-foodcoops
third-party
Commits
9cd967fe
Commit
9cd967fe
authored
3 years ago
by
Damien Moulard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
EP: hide delete shift button after action
parent
1e561340
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
7819-prevent-adding-product-already-in-order
7848-cannot-validate-qty-with-decimal-on-kg-product
7918_bug_quantites_stade_demande_prix
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
!159
EP: hide delete shift button after action
,
!164
Intégration des dév. Cooperatic pour la Cagette
Pipeline
#2114
passed with stage
in 1 minute 34 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
21 deletions
+30
-21
members-space-my-shifts.js
members_space/static/js/members-space-my-shifts.js
+1
-1
members-space-shifts-exchange.js
members_space/static/js/members-space-shifts-exchange.js
+26
-20
members-space.js
members_space/static/js/members-space.js
+3
-0
No files found.
members_space/static/js/members-space-my-shifts.js
View file @
9cd967fe
...
...
@@ -158,7 +158,7 @@ function init_history() {
if
(
cell
.
text
()
===
"Présent.e"
)
{
$
(
row
).
addClass
(
'row_partner_ok'
);
}
else
if
(
cell
.
text
()
===
"Retard"
)
{
}
else
if
(
cell
.
text
()
.
includes
(
"Retard"
)
)
{
$
(
row
).
addClass
(
'row_partner_late'
);
}
else
if
(
cell
.
text
()
===
"Absent.e"
)
{
$
(
row
).
addClass
(
'row_partner_absent'
);
...
...
This diff is collapsed.
Click to expand it.
members_space/static/js/members-space-shifts-exchange.js
View file @
9cd967fe
...
...
@@ -268,6 +268,8 @@ function offer_extra_shift() {
},
timeout
:
3000
,
success
:
function
()
{
partner_data
.
extra_shift_done
-=
1
;
$
(
"#can_delete_future_registrations_area"
).
hide
();
$
(
".delete_registration_button"
).
off
();
$
(
".delete_registration_button"
).
hide
();
...
...
@@ -723,27 +725,31 @@ function init_read_only_calendar_page() {
function
init_delete_registration_buttons
()
{
$
(
".delete_registration_button"
).
off
();
$
(
".delete_registration_button"
).
on
(
"click"
,
function
()
{
let
shift_name
=
$
(
this
).
closest
(
"div"
)
.
parent
().
parent
()
.
find
(
".shift_line_date"
)
.
text
()
.
trim
();
let
shift_id
=
$
(
this
).
closest
(
".shift_line_container"
)
.
attr
(
'id'
)
.
split
(
'_'
)[
2
];
openModal
(
`<p>Je m'apprête à supprimer ma présence au service du <b>
${
shift_name
}
</b></p>`
,
()
=>
{
delete_shift_registration
(
shift_id
);
},
"Confirmer"
,
false
);
});
$
(
".delete_registration_button"
).
hide
();
$
(
".delete_registration_button"
).
css
(
'display'
,
'flex'
);
if
(
partner_data
.
extra_shift_done
>
0
)
{
$
(
".delete_registration_button"
).
on
(
"click"
,
function
()
{
let
shift_name
=
$
(
this
).
closest
(
"div"
)
.
parent
().
parent
()
.
find
(
".shift_line_date"
)
.
text
()
.
trim
();
let
shift_id
=
$
(
this
).
closest
(
".shift_line_container"
)
.
attr
(
'id'
)
.
split
(
'_'
)[
2
];
openModal
(
`<p>Je m'apprête à supprimer ma présence au service du <b>
${
shift_name
}
</b></p>`
,
()
=>
{
delete_shift_registration
(
shift_id
);
},
"Confirmer"
,
false
);
});
$
(
".delete_registration_button"
).
css
(
'display'
,
'flex'
);
}
}
function
init_shifts_exchange
()
{
...
...
This diff is collapsed.
Click to expand it.
members_space/static/js/members-space.js
View file @
9cd967fe
...
...
@@ -222,8 +222,11 @@ function prepare_shift_line_template(date_begin) {
*/
function
init_my_info_data
()
{
$
(
".choose_makeups"
).
off
();
$
(
".choose_makeups"
).
hide
();
$
(
".remove_future_registration"
).
off
();
$
(
".remove_future_registration"
).
hide
();
$
(
".unsuscribed_form_link"
).
off
();
$
(
".unsuscribed_form_link"
).
hide
();
$
(
".member_shift_name"
).
text
(
partner_data
.
regular_shift_name
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment