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
ad099012
Commit
ad099012
authored
3 years ago
by
Etienne Freiss
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lint
parent
d82c419f
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
docker
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
master
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
5 merge requests
!103
WIP: Dev cooperatic
,
!86
Ticket 1727
,
!87
Integration Evolution bdm
,
!104
merge dev_cooperatic into dev_principale
,
!106
Dev principale
Pipeline
#1547
failed with stage
in 1 minute 29 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
9 deletions
+10
-9
members-space-shifts-exchange.js
members_space/static/js/members-space-shifts-exchange.js
+10
-9
No files found.
members_space/static/js/members-space-shifts-exchange.js
View file @
ad099012
...
...
@@ -188,10 +188,12 @@ function init_calendar_page() {
closeModal
,
"J'ai compris"
);
}).
show
();
})
.
show
();
}
else
{
$
(
"#calendar_explaination_button"
).
hide
();
$
(
"#calendar_explaination_area"
).
html
(
template_explanations
.
html
()).
show
();
$
(
"#calendar_explaination_area"
).
html
(
template_explanations
.
html
())
.
show
();
}
if
(
incoming_shifts
!==
null
)
{
...
...
@@ -366,14 +368,13 @@ function init_shifts_exchange() {
$
(
this
).
removeClass
(
'active'
);
});
});
}
else
if
(
}
else
if
(
partner_data
.
comite
===
"True"
)
{
let
msg_template
=
$
(
"#comite_template"
);
$
(
".comite_content_msg"
).
html
(
msg_template
.
html
());
$
(
"#comite_content"
).
show
();
}
else
if
(
partner_data
.
cooperative_state
===
'suspended'
}
else
if
(
partner_data
.
cooperative_state
===
'suspended'
&&
partner_data
.
date_delay_stop
===
'False'
)
{
$
(
"#suspended_content .makeups_nb"
).
text
(
partner_data
.
makeups_to_do
);
...
...
@@ -396,8 +397,8 @@ function init_shifts_exchange() {
init_calendar_page
();
}
$
(
window
).
smartresize
(
function
(){
$
(
window
).
smartresize
(
function
()
{
vw
=
window
.
innerWidth
;
init_calendar_page
();
});
}
\ No newline at end of file
}
\ No newline at end of file
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