Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Titouan Soulard
erp5
Commits
b0aed111
Commit
b0aed111
authored
Jan 25, 2017
by
Xiaowu Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_travel_expense: manually synchronize all
parent
596083cc
Changes
18
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
76 additions
and
105 deletions
+76
-105
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_add_comment_js.js
...hTemplateItem/web_page_module/gadget_hr_add_comment_js.js
+1
-5
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_add_comment_js.xml
...TemplateItem/web_page_module/gadget_hr_add_comment_js.xml
+2
-2
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_record_view_js.js
...eItem/web_page_module/gadget_hr_expense_record_view_js.js
+18
-24
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_record_view_js.xml
...Item/web_page_module/gadget_hr_expense_record_view_js.xml
+2
-2
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_jio_js.js
...ense/PathTemplateItem/web_page_module/gadget_hr_jio_js.js
+3
-0
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_jio_js.xml
...nse/PathTemplateItem/web_page_module/gadget_hr_jio_js.xml
+3
-3
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_leave_request_view_js.js
...teItem/web_page_module/gadget_hr_leave_request_view_js.js
+6
-19
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_leave_request_view_js.xml
...eItem/web_page_module/gadget_hr_leave_request_view_js.xml
+3
-3
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_mission_request_record_view_js.js
...b_page_module/gadget_hr_mission_request_record_view_js.js
+10
-19
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_mission_request_record_view_js.xml
..._page_module/gadget_hr_mission_request_record_view_js.xml
+3
-3
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_page_front_html.html
...mplateItem/web_page_module/gadget_hr_page_front_html.html
+1
-1
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_page_front_html.xml
...emplateItem/web_page_module/gadget_hr_page_front_html.xml
+2
-2
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_page_front_js.js
...thTemplateItem/web_page_module/gadget_hr_page_front_js.js
+5
-10
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_page_front_js.xml
...hTemplateItem/web_page_module/gadget_hr_page_front_js.xml
+2
-2
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_panel_html.html
...athTemplateItem/web_page_module/gadget_hr_panel_html.html
+1
-1
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_panel_html.xml
...PathTemplateItem/web_page_module/gadget_hr_panel_html.xml
+2
-2
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_tool_js.js
...nse/PathTemplateItem/web_page_module/gadget_hr_tool_js.js
+10
-5
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_tool_js.xml
...se/PathTemplateItem/web_page_module/gadget_hr_tool_js.xml
+2
-2
No files found.
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_add_comment_js.js
View file @
b0aed111
...
@@ -9,14 +9,13 @@
...
@@ -9,14 +9,13 @@
gadget_klass
gadget_klass
.
declareAcquiredMethod
(
'
post
'
,
'
jio_post
'
)
.
declareAcquiredMethod
(
'
post
'
,
'
jio_post
'
)
.
declareAcquiredMethod
(
'
put
'
,
'
jio_put
'
)
.
declareAcquiredMethod
(
'
put
'
,
'
jio_put
'
)
.
declareAcquiredMethod
(
"
repair
"
,
"
jio_repair
"
)
.
declareAcquiredMethod
(
"
allDocs
"
,
"
jio_allDocs
"
)
.
declareAcquiredMethod
(
"
allDocs
"
,
"
jio_allDocs
"
)
.
declareAcquiredMethod
(
"
redirect
"
,
"
redirect
"
)
.
declareAcquiredMethod
(
"
redirect
"
,
"
redirect
"
)
.
declareAcquiredMethod
(
"
remove
"
,
"
jio_remove
"
)
.
declareAcquiredMethod
(
"
remove
"
,
"
jio_remove
"
)
.
declareMethod
(
"
render
"
,
function
(
options
)
{
.
declareMethod
(
"
render
"
,
function
(
options
)
{
var
gadget
=
this
;
var
gadget
=
this
;
gadget
.
options
=
options
;
gadget
.
options
=
options
;
if
(
!
options
.
can_add_discussion
)
{
if
(
!
options
.
can_add_discussion
&&
!
options
.
doc
.
transition_comment
)
{
return
;
return
;
}
}
return
gadget
.
allDocs
({
return
gadget
.
allDocs
({
...
@@ -77,9 +76,6 @@
...
@@ -77,9 +76,6 @@
*/
*/
return
gadget
.
remove
(
gadget
.
options
.
jio_key
);
return
gadget
.
remove
(
gadget
.
options
.
jio_key
);
})
})
.
push
(
function
()
{
return
gadget
.
repair
();
})
.
push
(
function
()
{
.
push
(
function
()
{
return
gadget
.
redirect
({
page
:
gadget
.
options
.
page
});
return
gadget
.
redirect
({
page
:
gadget
.
options
.
page
});
});
});
...
...
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_add_comment_js.xml
View file @
b0aed111
...
@@ -236,7 +236,7 @@
...
@@ -236,7 +236,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
956.5
4664.34823.897
7
</string>
</value>
<value>
<string>
956.5
7258.37000.4440
7
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -254,7 +254,7 @@
...
@@ -254,7 +254,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1485
180096.34
</float>
<float>
1485
337559.65
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_record_view_js.js
View file @
b0aed111
...
@@ -116,7 +116,6 @@
...
@@ -116,7 +116,6 @@
.
declareAcquiredMethod
(
'
jio_remove
'
,
'
jio_remove
'
)
.
declareAcquiredMethod
(
'
jio_remove
'
,
'
jio_remove
'
)
.
declareAcquiredMethod
(
'
getSetting
'
,
'
getSetting
'
)
.
declareAcquiredMethod
(
'
getSetting
'
,
'
getSetting
'
)
.
declareAcquiredMethod
(
'
setSetting
'
,
'
setSetting
'
)
.
declareAcquiredMethod
(
'
setSetting
'
,
'
setSetting
'
)
.
declareAcquiredMethod
(
"
repair
"
,
"
jio_repair
"
)
.
declareAcquiredMethod
(
"
getUrlFor
"
,
"
getUrlFor
"
)
.
declareAcquiredMethod
(
"
getUrlFor
"
,
"
getUrlFor
"
)
.
declareMethod
(
'
triggerSubmit
'
,
function
()
{
.
declareMethod
(
'
triggerSubmit
'
,
function
()
{
...
@@ -126,7 +125,7 @@
...
@@ -126,7 +125,7 @@
.
declareMethod
(
"
render
"
,
function
(
options
)
{
.
declareMethod
(
"
render
"
,
function
(
options
)
{
var
gadget
=
this
,
var
gadget
=
this
,
sync_checked
,
sync_checked
,
s
ync_state
=
getWorkflowState
(
options
.
jio_key
,
options
.
doc
.
sync_flag
),
s
tate
=
getWorkflowState
(
options
),
geoLocation
,
geoLocation
,
related_mission_class
,
related_mission_class
,
related_mission_url
,
related_mission_url
,
...
@@ -168,7 +167,7 @@
...
@@ -168,7 +167,7 @@
})
})
.
push
(
function
(
url
)
{
.
push
(
function
(
url
)
{
related_mission_url
=
url
;
related_mission_url
=
url
;
if
(
s
ync_state
===
'
Synced
'
)
{
if
(
s
tate
.
readonly
)
{
geoLocation
=
{
coords
:
{
latitude
:
options
.
doc
.
latitude
,
longitude
:
options
.
doc
.
longitude
}};
geoLocation
=
{
coords
:
{
latitude
:
options
.
doc
.
latitude
,
longitude
:
options
.
doc
.
longitude
}};
}
else
{
}
else
{
geoLocation
=
{
coords
:
{
latitude
:
""
,
longitude
:
""
}};
geoLocation
=
{
coords
:
{
latitude
:
""
,
longitude
:
""
}};
...
@@ -208,7 +207,6 @@
...
@@ -208,7 +207,6 @@
not_sync_checked
=
'
checked
'
;
not_sync_checked
=
'
checked
'
;
}
}
ops
=
{
ops
=
{
state
:
options
.
doc
.
state
||
sync_state
,
preview
:
options
.
doc
.
photo_data
,
preview
:
options
.
doc
.
photo_data
,
quantity
:
options
.
doc
.
quantity
,
quantity
:
options
.
doc
.
quantity
,
date
:
options
.
doc
.
date
||
new
Date
().
toISOString
().
slice
(
0
,
10
),
date
:
options
.
doc
.
date
||
new
Date
().
toISOString
().
slice
(
0
,
10
),
...
@@ -221,10 +219,13 @@
...
@@ -221,10 +219,13 @@
latitude
:
geoLocation
.
coords
.
latitude
||
""
,
latitude
:
geoLocation
.
coords
.
latitude
||
""
,
related_mission_url
:
related_mission_url
||
""
,
related_mission_url
:
related_mission_url
||
""
,
related_mission_class
:
related_mission_class
,
related_mission_class
:
related_mission_class
,
related_mission
:
related_mission
related_mission
:
related_mission
,
not_readonly
:
!
state
.
readonly
};
};
if
(
sync_state
!==
'
Synced
'
)
{
if
(
state
.
sync_state
===
'
Synced
'
)
{
ops
.
not_readonly
=
true
;
ops
.
state
=
options
.
doc
.
state
||
state
.
sync_state
;
}
else
{
ops
.
state
=
state
.
sync_state
;
}
}
return
template
(
ops
);
return
template
(
ops
);
})
})
...
@@ -244,7 +245,7 @@
...
@@ -244,7 +245,7 @@
.
push
(
function
()
{
.
push
(
function
()
{
return
gadget
.
updateHeader
({
return
gadget
.
updateHeader
({
title
:
gadget
.
options
.
jio_key
+
"
"
+
(
gadget
.
options
.
doc
.
record_revision
||
1
),
title
:
gadget
.
options
.
jio_key
+
"
"
+
(
gadget
.
options
.
doc
.
record_revision
||
1
),
save_action
:
sync_state
===
'
Synced
'
?
false
:
true
save_action
:
!
state
.
readonly
});
});
})
})
.
push
(
function
()
{
.
push
(
function
()
{
...
@@ -316,8 +317,8 @@
...
@@ -316,8 +317,8 @@
/////////////////////////////////////////
/////////////////////////////////////////
.
declareService
(
function
()
{
.
declareService
(
function
()
{
var
gadget
=
this
,
var
gadget
=
this
,
state
=
getWorkflowState
(
gadget
.
options
.
jio_key
,
gadget
.
options
.
doc
.
sync_flag
);
state
=
getWorkflowState
(
gadget
.
options
);
if
(
state
===
'
Synced
'
)
{
if
(
state
.
readonly
)
{
gadget
.
props
.
deferred1
.
resolve
();
gadget
.
props
.
deferred1
.
resolve
();
return
;
return
;
}
}
...
@@ -357,6 +358,7 @@
...
@@ -357,6 +358,7 @@
function
()
{
function
()
{
return
getData
(
gadget
)
return
getData
(
gadget
)
.
push
(
function
(
doc
)
{
.
push
(
function
(
doc
)
{
var
key
;
if
(
doc
.
sync_flag
===
'
1
'
)
{
if
(
doc
.
sync_flag
===
'
1
'
)
{
sync
=
1
;
sync
=
1
;
}
}
...
@@ -370,20 +372,12 @@
...
@@ -370,20 +372,12 @@
})
})
.
push
(
function
()
{
.
push
(
function
()
{
return
gadget
.
props
.
geoGadget
.
createGeoLocationRecord
();
return
gadget
.
props
.
geoGadget
.
createGeoLocationRecord
();
})
});
.
push
(
function
()
{
}
return
gadget
.
repair
();
})
})
.
push
(
function
()
{
.
push
(
function
()
{
alertify
.
success
(
"
Saved
"
);
return
gadget
.
redirect
({
page
:
'
expense_record_list
'
});
})
})
.
push
(
function
()
{
alertify
.
success
(
"
Saved
"
);
});
}
else
{
alertify
.
success
(
"
Saved
"
);
}
});
}
}
)
)
})
})
...
...
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_expense_record_view_js.xml
View file @
b0aed111
...
@@ -242,7 +242,7 @@
...
@@ -242,7 +242,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
956.5
4368.26223.52002
</string>
</value>
<value>
<string>
956.5
7356.32253.30464
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -260,7 +260,7 @@
...
@@ -260,7 +260,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1485
162384.2
5
</float>
<float>
1485
341787.0
5
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_jio_js.js
View file @
b0aed111
...
@@ -354,6 +354,9 @@
...
@@ -354,6 +354,9 @@
return
wrapJioCall
(
this
,
'
repair
'
,
arguments
)
return
wrapJioCall
(
this
,
'
repair
'
,
arguments
)
.
push
(
function
()
{
.
push
(
function
()
{
return
setUserTitle
(
gadget
);
return
setUserTitle
(
gadget
);
})
.
push
(
function
()
{
return
gadget
.
setSetting
(
'
last_sync_date
'
,
new
Date
().
toLocaleString
());
});
});
})
})
.
declareMethod
(
'
allDocs
'
,
function
()
{
.
declareMethod
(
'
allDocs
'
,
function
()
{
...
...
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_jio_js.xml
View file @
b0aed111
...
@@ -224,7 +224,7 @@
...
@@ -224,7 +224,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
actor
</string>
</key>
<key>
<string>
actor
</string>
</key>
<value>
<string>
supercedriclen
</string>
</value>
<value>
<string>
zope
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
comment
</string>
</key>
<key>
<string>
comment
</string>
</key>
...
@@ -238,7 +238,7 @@
...
@@ -238,7 +238,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
956.5
5783.61341.2013
</string>
</value>
<value>
<string>
956.5
7376.32743.11895
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -256,7 +256,7 @@
...
@@ -256,7 +256,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
14853
39651.94
</float>
<float>
14853
48028.59
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_leave_request_view_js.js
View file @
b0aed111
...
@@ -76,8 +76,7 @@
...
@@ -76,8 +76,7 @@
.
declareAcquiredMethod
(
'
jio_remove
'
,
'
jio_remove
'
)
.
declareAcquiredMethod
(
'
jio_remove
'
,
'
jio_remove
'
)
.
declareAcquiredMethod
(
'
getSetting
'
,
'
getSetting
'
)
.
declareAcquiredMethod
(
'
getSetting
'
,
'
getSetting
'
)
.
declareAcquiredMethod
(
'
setSetting
'
,
'
setSetting
'
)
.
declareAcquiredMethod
(
'
setSetting
'
,
'
setSetting
'
)
.
declareAcquiredMethod
(
"
repair
"
,
"
jio_repair
"
)
.
declareMethod
(
'
triggerSubmit
'
,
function
()
{
.
declareMethod
(
'
triggerSubmit
'
,
function
()
{
return
this
.
props
.
element
.
querySelector
(
'
button
'
).
click
();
return
this
.
props
.
element
.
querySelector
(
'
button
'
).
click
();
...
@@ -86,7 +85,7 @@
...
@@ -86,7 +85,7 @@
.
declareMethod
(
"
render
"
,
function
(
options
)
{
.
declareMethod
(
"
render
"
,
function
(
options
)
{
var
gadget
=
this
,
var
gadget
=
this
,
sync_checked
,
sync_checked
,
s
ync_state
=
getWorkflowState
(
options
.
jio_key
,
options
.
doc
.
sync_flag
),
s
tate
=
getWorkflowState
(
options
),
not_sync_checked
;
not_sync_checked
;
gadget
.
options
=
options
;
gadget
.
options
=
options
;
...
@@ -104,7 +103,7 @@
...
@@ -104,7 +103,7 @@
not_sync_checked
=
'
checked
'
;
not_sync_checked
=
'
checked
'
;
}
}
ops
=
{
ops
=
{
state
:
options
.
doc
.
state
||
sync_state
,
state
:
options
.
doc
.
state
||
s
tate
.
s
ync_state
,
start_date
:
options
.
doc
.
start_date
||
new
Date
().
toISOString
().
slice
(
0
,
10
),
start_date
:
options
.
doc
.
start_date
||
new
Date
().
toISOString
().
slice
(
0
,
10
),
stop_date
:
options
.
doc
.
stop_date
||
new
Date
().
toISOString
().
slice
(
0
,
10
),
stop_date
:
options
.
doc
.
stop_date
||
new
Date
().
toISOString
().
slice
(
0
,
10
),
quantity
:
options
.
doc
.
quantity
,
quantity
:
options
.
doc
.
quantity
,
...
@@ -112,17 +111,15 @@
...
@@ -112,17 +111,15 @@
sync_checked
:
sync_checked
,
sync_checked
:
sync_checked
,
not_sync_checked
:
not_sync_checked
,
not_sync_checked
:
not_sync_checked
,
select_options
:
select_options
,
select_options
:
select_options
,
not_readonly
:
!
state
.
readonly
};
};
if
(
sync_state
!==
'
Synced
'
)
{
ops
.
not_readonly
=
true
;
}
return
template
(
ops
);
return
template
(
ops
);
})
})
.
push
(
function
(
html
)
{
.
push
(
function
(
html
)
{
gadget
.
props
.
element
.
innerHTML
=
html
;
gadget
.
props
.
element
.
innerHTML
=
html
;
return
gadget
.
updateHeader
({
return
gadget
.
updateHeader
({
title
:
"
Demande de congé
"
,
title
:
"
Demande de congé
"
,
save_action
:
sync_state
===
'
Synced
'
?
false
:
true
save_action
:
!
state
.
readonly
});
});
})
})
.
push
(
function
()
{
.
push
(
function
()
{
...
@@ -270,17 +267,7 @@
...
@@ -270,17 +267,7 @@
return
gadget
.
put
(
gadget
.
options
.
jio_key
,
doc
);
return
gadget
.
put
(
gadget
.
options
.
jio_key
,
doc
);
})
})
.
push
(
function
()
{
.
push
(
function
()
{
if
(
sync
===
1
)
{
alertify
.
success
(
"
Saved
"
);
return
gadget
.
repair
()
.
push
(
function
()
{
return
gadget
.
redirect
({
page
:
'
leave_request_record_list
'
});
})
.
push
(
function
()
{
alertify
.
success
(
"
Saved
"
);
});
}
else
{
alertify
.
success
(
"
Saved
"
);
}
});
});
}
}
)
)
...
...
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_leave_request_view_js.xml
View file @
b0aed111
...
@@ -230,7 +230,7 @@
...
@@ -230,7 +230,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
actor
</string>
</key>
<key>
<string>
actor
</string>
</key>
<value>
<string>
supercedriclen
</string>
</value>
<value>
<string>
zope
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
comment
</string>
</key>
<key>
<string>
comment
</string>
</key>
...
@@ -244,7 +244,7 @@
...
@@ -244,7 +244,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
956.5
4639.50122.42052
</string>
</value>
<value>
<string>
956.5
7480.16314.62344
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -262,7 +262,7 @@
...
@@ -262,7 +262,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1485
178593.24
</float>
<float>
1485
349157.61
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_mission_request_record_view_js.js
View file @
b0aed111
...
@@ -64,8 +64,7 @@
...
@@ -64,8 +64,7 @@
.
declareAcquiredMethod
(
'
jio_remove
'
,
'
jio_remove
'
)
.
declareAcquiredMethod
(
'
jio_remove
'
,
'
jio_remove
'
)
.
declareAcquiredMethod
(
'
getSetting
'
,
'
getSetting
'
)
.
declareAcquiredMethod
(
'
getSetting
'
,
'
getSetting
'
)
.
declareAcquiredMethod
(
'
setSetting
'
,
'
setSetting
'
)
.
declareAcquiredMethod
(
'
setSetting
'
,
'
setSetting
'
)
.
declareAcquiredMethod
(
"
repair
"
,
"
jio_repair
"
)
.
declareMethod
(
'
triggerSubmit
'
,
function
()
{
.
declareMethod
(
'
triggerSubmit
'
,
function
()
{
return
this
.
props
.
element
.
querySelector
(
'
button
'
).
click
();
return
this
.
props
.
element
.
querySelector
(
'
button
'
).
click
();
...
@@ -74,7 +73,7 @@
...
@@ -74,7 +73,7 @@
.
declareMethod
(
"
render
"
,
function
(
options
)
{
.
declareMethod
(
"
render
"
,
function
(
options
)
{
var
gadget
=
this
,
var
gadget
=
this
,
sync_checked
,
sync_checked
,
s
ync_state
=
getWorkflowState
(
options
.
jio_key
,
options
.
doc
.
sync_flag
),
s
tate
=
getWorkflowState
(
options
),
not_sync_checked
;
not_sync_checked
;
gadget
.
options
=
options
;
gadget
.
options
=
options
;
...
@@ -95,17 +94,19 @@
...
@@ -95,17 +94,19 @@
title
:
options
.
doc
.
title
,
title
:
options
.
doc
.
title
,
destination_node_title
:
options
.
doc
.
destination_node_title
,
destination_node_title
:
options
.
doc
.
destination_node_title
,
site
:
options
.
doc
.
site
,
site
:
options
.
doc
.
site
,
state
:
options
.
doc
.
state
||
sync_state
,
is_synced
:
state
.
sync_state
===
"
Synced
"
,
is_synced
:
sync_state
===
"
Synced
"
,
start_date
:
options
.
doc
.
start_date
||
new
Date
().
toISOString
().
slice
(
0
,
10
),
start_date
:
options
.
doc
.
start_date
||
new
Date
().
toISOString
().
slice
(
0
,
10
),
stop_date
:
options
.
doc
.
stop_date
||
new
Date
().
toISOString
().
slice
(
0
,
10
),
stop_date
:
options
.
doc
.
stop_date
||
new
Date
().
toISOString
().
slice
(
0
,
10
),
quantity
:
options
.
doc
.
quantity
,
quantity
:
options
.
doc
.
quantity
,
comment
:
options
.
doc
.
comment
,
comment
:
options
.
doc
.
comment
,
sync_checked
:
sync_checked
,
sync_checked
:
sync_checked
,
not_sync_checked
:
not_sync_checked
,
not_sync_checked
:
not_sync_checked
,
not_readonly
:
!
state
.
readonly
};
};
if
(
sync_state
!==
'
Synced
'
)
{
if
(
state
.
sync_state
===
'
Synced
'
)
{
ops
.
not_readonly
=
true
;
ops
.
state
=
options
.
doc
.
state
||
state
.
sync_state
;
}
else
{
ops
.
state
=
state
.
sync_state
;
}
}
return
template
(
ops
);
return
template
(
ops
);
})
})
...
@@ -125,7 +126,7 @@
...
@@ -125,7 +126,7 @@
.
push
(
function
()
{
.
push
(
function
()
{
return
gadget
.
updateHeader
({
return
gadget
.
updateHeader
({
title
:
gadget
.
options
.
jio_key
+
"
"
+
(
gadget
.
options
.
doc
.
record_revision
||
1
),
title
:
gadget
.
options
.
jio_key
+
"
"
+
(
gadget
.
options
.
doc
.
record_revision
||
1
),
save_action
:
sync_state
===
'
Synced
'
?
false
:
true
save_action
:
!
state
.
readonly
});
});
})
})
.
push
(
function
()
{
.
push
(
function
()
{
...
@@ -275,17 +276,7 @@
...
@@ -275,17 +276,7 @@
return
gadget
.
put
(
gadget
.
options
.
jio_key
,
doc
);
return
gadget
.
put
(
gadget
.
options
.
jio_key
,
doc
);
})
})
.
push
(
function
()
{
.
push
(
function
()
{
if
(
sync
===
1
)
{
alertify
.
success
(
"
Saved
"
);
return
gadget
.
repair
()
.
push
(
function
()
{
return
gadget
.
redirect
({
page
:
'
travel_request_record_list
'
});
})
.
push
(
function
()
{
alertify
.
success
(
"
Saved
"
);
});
}
else
{
alertify
.
success
(
"
Saved
"
);
}
});
});
}
}
)
)
...
...
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_mission_request_record_view_js.xml
View file @
b0aed111
...
@@ -230,7 +230,7 @@
...
@@ -230,7 +230,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
actor
</string>
</key>
<key>
<string>
actor
</string>
</key>
<value>
<string>
supercedriclen
</string>
</value>
<value>
<string>
zope
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
comment
</string>
</key>
<key>
<string>
comment
</string>
</key>
...
@@ -244,7 +244,7 @@
...
@@ -244,7 +244,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
956.
44329.14852.21316
</string>
</value>
<value>
<string>
956.
57361.9593.1092
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -262,7 +262,7 @@
...
@@ -262,7 +262,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
148
4576818.21
</float>
<float>
148
5341897.03
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_page_front_html.html
View file @
b0aed111
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
<form
class=
"synchro-form view-web-page-form"
>
<form
class=
"synchro-form view-web-page-form"
>
<button
type=
"submit"
data-i18n=
"Send & Receive"
data-theme=
"c"
class=
" ui-btn ui-btn-c ui-shadow ui-corner-all"
>
Send
&
Receive
</button>
<button
type=
"submit"
data-i18n=
"Send & Receive"
data-theme=
"c"
class=
" ui-btn ui-btn-c ui-shadow ui-corner-all"
>
Send
&
Receive
</button>
<span>
Last Synchronization Date:
</span>
<span>
Last Synchronization Date:
</span>
<span
class=
"last_sync_date"
></span>
<span
class=
"last_sync_date"
style=
'color: red;'
></span>
</form>
</form>
</div>
</div>
</div>
</div>
...
...
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_page_front_html.xml
View file @
b0aed111
...
@@ -242,7 +242,7 @@
...
@@ -242,7 +242,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
956.547
18.44080.11008
</string>
</value>
<value>
<string>
956.547
94.17747.54920
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -260,7 +260,7 @@
...
@@ -260,7 +260,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1485
187816.2
</float>
<float>
1485
342857.58
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_page_front_js.js
View file @
b0aed111
...
@@ -34,10 +34,8 @@
...
@@ -34,10 +34,8 @@
.
declareAcquiredMethod
(
"
getUrlFor
"
,
"
getUrlFor
"
)
.
declareAcquiredMethod
(
"
getUrlFor
"
,
"
getUrlFor
"
)
.
declareAcquiredMethod
(
"
updateHeader
"
,
"
updateHeader
"
)
.
declareAcquiredMethod
(
"
updateHeader
"
,
"
updateHeader
"
)
.
declareAcquiredMethod
(
'
getSetting
'
,
'
getSetting
'
)
.
declareAcquiredMethod
(
'
getSetting
'
,
'
getSetting
'
)
.
declareAcquiredMethod
(
'
setSetting
'
,
'
setSetting
'
)
.
declareAcquiredMethod
(
"
jio_allDocs
"
,
"
jio_allDocs
"
)
.
declareAcquiredMethod
(
"
jio_allDocs
"
,
"
jio_allDocs
"
)
.
declareAcquiredMethod
(
"
repair
"
,
"
jio_repair
"
)
.
declareAcquiredMethod
(
"
redirect
"
,
"
redirect
"
)
.
declareAcquiredMethod
(
"
reload
"
,
"
reload
"
)
.
allowPublicAcquisition
(
"
jio_allDocs
"
,
function
(
param_list
)
{
.
allowPublicAcquisition
(
"
jio_allDocs
"
,
function
(
param_list
)
{
var
gadget
=
this
;
var
gadget
=
this
;
return
this
.
jio_allDocs
.
apply
(
this
,
param_list
)
return
this
.
jio_allDocs
.
apply
(
this
,
param_list
)
...
@@ -151,13 +149,10 @@
...
@@ -151,13 +149,10 @@
false
,
false
,
function
()
{
function
()
{
gadget
.
props
.
element
.
querySelector
(
"
button
"
).
disabled
=
true
;
gadget
.
props
.
element
.
querySelector
(
"
button
"
).
disabled
=
true
;
return
gadget
.
repair
()
return
gadget
.
redirect
({
.
push
(
function
()
{
page
:
'
sync
'
,
return
gadget
.
setSetting
(
'
last_sync_date
'
,
new
Date
().
toLocaleString
());
auto_repair
:
true
})
});
.
push
(
function
()
{
return
gadget
.
reload
();
});
});
});
});
});
});
});
...
...
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_page_front_js.xml
View file @
b0aed111
...
@@ -270,7 +270,7 @@
...
@@ -270,7 +270,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
956.5
4730.11019.41386
</string>
</value>
<value>
<string>
956.5
7372.34651.59340
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -288,7 +288,7 @@
...
@@ -288,7 +288,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1485
187819.16
</float>
<float>
1485
342563.92
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_panel_html.html
View file @
b0aed111
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
<
li
><
a
href
=
"
#page=localisation
"
data
-
i18n
=
"
localisation
"
>
localisation
<
/a></
li
>
<
li
><
a
href
=
"
#page=localisation
"
data
-
i18n
=
"
localisation
"
>
localisation
<
/a></
li
>
<
li
><
a
href
=
"
#page=expense_report
"
data
-
i18n
=
"
Reports
"
>
Reports
<
/a></
li
>
<
li
><
a
href
=
"
#page=expense_report
"
data
-
i18n
=
"
Reports
"
>
Reports
<
/a></
li
>
<!--
li
><
a
href
=
"
#page=jio_configurator
"
data
-
i18n
=
"
Storage Configuration
"
>
Storage
Configuration
<
/a></
li
-->
<!--
li
><
a
href
=
"
#page=jio_configurator
"
data
-
i18n
=
"
Storage Configuration
"
>
Storage
Configuration
<
/a></
li
-->
<
li
><
a
href
=
"
#page=sync
"
data
-
i18n
=
"
Synchroniz
ation
"
>
Synchronization
<
/a></
li
>
<
li
><
a
href
=
"
#page=sync
"
data
-
i18n
=
"
Synchroniz
e
"
>
Synchronize
<
/a></
li
>
<
/ul
>
<
/ul
>
<
/div
>
<
/div
>
</script>
</script>
...
...
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_panel_html.xml
View file @
b0aed111
...
@@ -269,7 +269,7 @@
...
@@ -269,7 +269,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
956.
47536.31130.48230
</string>
</value>
<value>
<string>
956.
54637.11779.49271
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -287,7 +287,7 @@
...
@@ -287,7 +287,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1485
178390.7
3
</float>
<float>
1485
342891.
3
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_tool_js.js
View file @
b0aed111
...
@@ -3,16 +3,21 @@
...
@@ -3,16 +3,21 @@
(
function
(
window
,
RSVP
)
{
(
function
(
window
,
RSVP
)
{
"
use strict
"
;
"
use strict
"
;
window
.
getWorkflowState
=
function
(
id
,
sync_flag
)
{
window
.
getWorkflowState
=
function
(
options
)
{
var
sync_state
;
var
sync_state
,
if
(
id
.
indexOf
(
"
_module/
"
)
>
0
){
readonly
=
false
;
if
(
options
.
jio_key
.
indexOf
(
"
_module/
"
)
>
0
){
sync_state
=
"
Synced
"
;
sync_state
=
"
Synced
"
;
}
else
if
(
sync_flag
){
readonly
=
true
;
}
else
if
(
options
.
doc
.
sync_flag
){
sync_state
=
"
Not Synced
"
;
sync_state
=
"
Not Synced
"
;
if
(
options
.
doc
.
state
)
{
readonly
=
true
;
}
}
else
{
}
else
{
sync_state
=
"
Not Ready To Sync
"
;
sync_state
=
"
Not Ready To Sync
"
;
}
}
return
sync_state
;
return
{
sync_state
:
sync_state
,
readonly
:
readonly
}
;
};
};
window
.
geoLocationPromise
=
function
()
{
window
.
geoLocationPromise
=
function
()
{
...
...
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_tool_js.xml
View file @
b0aed111
...
@@ -234,7 +234,7 @@
...
@@ -234,7 +234,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
956.
45945.18260.2546
3
</string>
</value>
<value>
<string>
956.
57355.19823.1464
3
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -252,7 +252,7 @@
...
@@ -252,7 +252,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
148
4840353.8
</float>
<float>
148
5347131.83
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
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