nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 23:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Start the timer on the basis of time diff between now_time and timestamp

Browse Source
This commit is contained in:
Shreya
2018-03-21 15:33:59 +05:30
parent 7cc288a6db
commit 05e516efc4
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
erpnext/projects/doctype/timesheet/timesheet.js
View File

@@ -78,6 +78,7 @@ frappe.ui.form.on("Timesheet", {
if (row.timer_timestamp) { if (row.timer_timestamp) {
let timestamp = moment(frappe.datetime.now_datetime()).diff(moment(row.timer_timestamp),"seconds"); let timestamp = moment(frappe.datetime.now_datetime()).diff(moment(row.timer_timestamp),"seconds");
timer(frm, disabled, row, timestamp); timer(frm, disabled, row, timestamp);
} }
else { else {
row.timer_timestamp = frappe.datetime.now_datetime(); row.timer_timestamp = frappe.datetime.now_datetime();
@@ -261,7 +262,25 @@ var control_timer = function(frm, dialog, row, timestamp=0) {
$(".playpause").click(function(e) { $(".playpause").click(function(e) {
if (!initialised) { if (!initialised) {
var args = dialog.get_values();
if(!args) return;
if (!frm.doc.time_logs[0].activity_type) {
frm.doc.time_logs = [];
}
row = frappe.model.add_child(frm.doc, "Timesheet Detail", "time_logs");
row.activity_type = args.activity_type;
row.from_time = frappe.datetime.get_datetime_as_string();
row.hours = args.hours;
row.project = args.project;
row.timer_timestamp = frappe.datetime.now_datetime();
let d = moment(row.from_time)
if(row.hours) {
d.add(row.hours, "hours");
row.to_time = d.format(moment.defaultDatetimeFormat);
}
row.status = 'Pending';
frm.refresh_field("time_logs");
}
if (clicked) { if (clicked) {
e.preventDefault(); e.preventDefault();
return false; return false;