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
deedd4a3
Commit
deedd4a3
authored
3 years ago
by
François
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Run eslint --fix
parent
ad099012
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
#1549
passed with stage
in 1 minute 29 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
23 deletions
+28
-23
members_admin.js
members/static/js/members_admin.js
+1
-1
members-space-home.js
members_space/static/js/members-space-home.js
+1
-1
members-space-my-shifts.js
members_space/static/js/members-space-my-shifts.js
+7
-6
members-space.js
members_space/static/js/members-space.js
+19
-15
No files found.
members/static/js/members_admin.js
View file @
deedd4a3
...
...
@@ -228,7 +228,7 @@ function display_makeups_members() {
/**
* Send request to update members nb of makeups to do
*
*
* @param {Array} member_ids
* @param {String} action increment | decrement
*/
...
...
This diff is collapsed.
Click to expand it.
members_space/static/js/members-space-home.js
View file @
deedd4a3
...
...
@@ -100,7 +100,7 @@ function init_home() {
e
.
preventDefault
();
goto
(
'faq'
);
});
if
(
partner_data
.
is_in_association
===
false
)
{
$
(
"#home .member_associated_partner_area"
).
hide
();
}
else
{
...
...
This diff is collapsed.
Click to expand it.
members_space/static/js/members-space-my-shifts.js
View file @
deedd4a3
...
...
@@ -50,18 +50,19 @@ function prepare_server_data(data) {
for
(
history_item
of
data
)
{
if
(
history_item
.
is_amnesty
!==
undefined
)
{
let
shift_datetime
=
new
Date
(
history_item
.
date_begin
);
let
str_shift_datetime
=
`
${(
"0"
+
shift_datetime
.
getDate
()).
slice
(
-
2
)}
/
${(
"0"
+
(
shift_datetime
.
getMonth
()
+
1
)).
slice
(
-
2
)}
/
${
shift_datetime
.
getFullYear
()}
`
let
str_shift_datetime
=
`
${(
"0"
+
shift_datetime
.
getDate
()).
slice
(
-
2
)}
/
${(
"0"
+
(
shift_datetime
.
getMonth
()
+
1
)).
slice
(
-
2
)}
/
${
shift_datetime
.
getFullYear
()}
`
;
history_item
.
shift_name
=
`
${
history_item
.
shift_name
}
du
${
str_shift_datetime
}
`
history_item
.
shift_name
=
`
${
history_item
.
shift_name
}
du
${
str_shift_datetime
}
`
;
}
else
{
history_item
.
shift_name
=
(
history_item
.
shift_id
===
false
)
?
''
:
history_item
.
shift_id
[
1
];
if
(
history_item
.
name
===
"Services des comités"
)
{
let
shift_datetime
=
new
Date
(
history_item
.
date_begin
);
let
str_shift_datetime
=
`
${(
"0"
+
shift_datetime
.
getDate
()).
slice
(
-
2
)}
/
${(
"0"
+
(
shift_datetime
.
getMonth
()
+
1
)).
slice
(
-
2
)}
/
${
shift_datetime
.
getFullYear
()}
`
let
str_shift_datetime
=
`
${(
"0"
+
shift_datetime
.
getDate
()).
slice
(
-
2
)}
/
${(
"0"
+
(
shift_datetime
.
getMonth
()
+
1
)).
slice
(
-
2
)}
/
${
shift_datetime
.
getFullYear
()}
`
;
str_shift_datetime
=
str_shift_datetime
+
" "
+
shift_datetime
.
toLocaleTimeString
(
"fr-fr"
,
time_options
);
history_item
.
shift_name
=
`Services des comités
${
str_shift_datetime
}
`
history_item
.
shift_name
=
`Services des comités
${
str_shift_datetime
}
`
;
}
}
...
...
This diff is collapsed.
Click to expand it.
members_space/static/js/members-space.js
View file @
deedd4a3
...
...
@@ -189,11 +189,11 @@ function init_my_info_data() {
});
});
}
else
if
(
partner_data
.
cooperative_state
===
'exempted'
)
{
const
d
=
new
Date
(
Date
.
parse
(
partner_data
.
leave_stop_date
));
const
f_date_delay_stop
=
d
.
getDate
()
+
'/'
+
(
"0"
+
(
d
.
getMonth
()
+
1
)).
slice
(
-
2
)
+
'/'
+
d
.
getFullYear
();
const
d
=
new
Date
(
Date
.
parse
(
partner_data
.
leave_stop_date
));
const
f_date_delay_stop
=
d
.
getDate
()
+
'/'
+
(
"0"
+
(
d
.
getMonth
()
+
1
)).
slice
(
-
2
)
+
'/'
+
d
.
getFullYear
();
$
(
".delay_date_stop"
).
text
(
f_date_delay_stop
);
$
(
".delay_date_stop_container"
).
show
();
$
(
".delay_date_stop"
).
text
(
f_date_delay_stop
);
$
(
".delay_date_stop_container"
).
show
();
}
if
(
...
...
@@ -252,29 +252,33 @@ $(document).ready(function() {
};
});
(
function
(
$
,
sr
)
{
(
function
(
$
,
sr
)
{
// debouncing function from John Hann
// http://unscriptable.com/index.php/2009/03/20/debouncing-javascript-methods/
var
debounce
=
function
(
func
,
threshold
,
execAsap
)
{
var
timeout
;
return
function
debounced
()
{
var
obj
=
this
,
args
=
arguments
;
function
delayed
()
{
if
(
!
execAsap
)
func
.
apply
(
obj
,
args
);
timeout
=
null
;
}
;
}
if
(
timeout
)
clearTimeout
(
timeout
);
else
if
(
execAsap
)
func
.
apply
(
obj
,
args
);
timeout
=
setTimeout
(
delayed
,
threshold
||
100
);
};
}
// smartresize
jQuery
.
fn
[
sr
]
=
function
(
fn
){
return
fn
?
this
.
bind
(
'resize'
,
debounce
(
fn
))
:
this
.
trigger
(
sr
);
};
})(
jQuery
,
'smartresize'
);
\ No newline at end of file
};
// smartresize
jQuery
.
fn
[
sr
]
=
function
(
fn
)
{
return
fn
?
this
.
bind
(
'resize'
,
debounce
(
fn
))
:
this
.
trigger
(
sr
);
};
})(
jQuery
,
'smartresize'
);
\ 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