Skip to content

Commit 949e93b

Browse files
committed
fixed #58 and some code hygiene
1 parent 3019f7f commit 949e93b

File tree

2 files changed

+50
-47
lines changed

2 files changed

+50
-47
lines changed

js/timer.js

Lines changed: 49 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -99,64 +99,67 @@
9999
autoOpen: false,
100100
buttons :
101101
[ {
102-
id: 'confirm-button',
103-
text: "Confirm",
104-
click: function() {
105-
var baseUrl = OC.generateUrl('/apps/timetracker/ajax/add-work-interval/'+$('#name-manual-entry').val());
106-
107-
var jqxhr = $.post( baseUrl,{start:picker.data('daterangepicker').startDate.format('DD/MM/YY HH:mm'), end:picker.data('daterangepicker').endDate.format('DD/MM/YY HH:mm'), tzoffset: new Date().getTimezoneOffset(), details:$('#details-manual-entry').val()} ,function() {
108-
getWorkItems();
109-
$("#dialog-manual-entry").dialog("close");
110-
})
111-
.done(function(data, status, jqXHR) {
112-
var response = data;
113-
if ('Error' in response){
114-
alert(response.Error);
115-
}
102+
id: 'confirm-button',
103+
text: "Confirm",
104+
click: function() {
105+
var baseUrl = OC.generateUrl('/apps/timetracker/ajax/add-work-interval/'+$('#name-manual-entry').val());
106+
107+
var jqxhr = $.post( baseUrl,{start:picker.data('daterangepicker').startDate.format('DD/MM/YY HH:mm'), end:picker.data('daterangepicker').endDate.format('DD/MM/YY HH:mm'), tzoffset: new Date().getTimezoneOffset(), details:$('#details-manual-entry').val()} ,function() {
108+
getWorkItems();
109+
$("#dialog-manual-entry").dialog("close");
116110
})
117-
.fail(function() {
118-
alert( "error" );
119-
})
120-
},
111+
.done(function(data, status, jqXHR) {
112+
var response = data;
113+
if ('Error' in response){
114+
alert(response.Error);
115+
}
116+
})
117+
.fail(function() {
118+
alert( "error" );
119+
})
120+
},
121121
},
122-
{
123-
id: 'cancel-button',
124-
text: "Cancel",
125-
click: function() {
126-
$(this).dialog("close");
122+
{
123+
id: 'cancel-button',
124+
text: "Cancel",
125+
click: function() {
126+
$(this).dialog("close");
127+
},
127128
},
128-
},]
129+
]
130+
129131
});
130132

131133
$('#manual-entry-button').click(function(e) {
134+
$("#hours-manual-entry").val('');
132135
$("#dialog-manual-entry").dialog("open");
133136
return false;
134137
});
135138
validateManualEntryFields();
136139

137-
function editWorkIntem(dialogWorkItemEditForm){
138-
target = dialogWorkItemEditForm.target;
139-
form = dialogWorkItemEditForm.find( "form" );
140-
var id = $(target).data('myid');
141-
var baseUrl = OC.generateUrl("/apps/timetracker/ajax/update-work-interval/"+id);
142-
var jqxhr = $.post( baseUrl, {name:form.find("#name").val(),details:form.find("#details").val()},function() {
143-
getWorkItems();
144-
$(dialogWorkItemEditForm).dialog("close");
145-
})
146-
.done(function(data, status, jqXHR) {
147-
var response = data;
148-
if ('Error' in response){
149-
alert(response.Error);
150-
}
151-
})
152-
.fail(function() {
153-
alert( "error" );
154-
})
155-
.always(function() {
156-
157-
});
140+
function editWorkIntem(dialogWorkItemEditForm){
141+
target = dialogWorkItemEditForm.target;
142+
form = dialogWorkItemEditForm.find( "form" );
143+
var id = $(target).data('myid');
144+
var baseUrl = OC.generateUrl("/apps/timetracker/ajax/update-work-interval/"+id);
145+
var jqxhr = $.post( baseUrl, {name:form.find("#name").val(),details:form.find("#details").val()},function() {
146+
getWorkItems();
147+
$(dialogWorkItemEditForm).dialog("close");
148+
})
149+
.done(function(data, status, jqXHR) {
150+
var response = data;
151+
if ('Error' in response){
152+
alert(response.Error);
153+
}
154+
})
155+
.fail(function() {
156+
alert( "error" );
157+
})
158+
.always(function() {
159+
160+
});
158161

159-
}
162+
}
160163
function cutString(s, n){
161164
if (s.length < n) {
162165
return s;

templates/content/index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</form>
3737
</div>
3838
39-
<div id="dialog-manual-entry" title="Edit work item" class='hidden'>
39+
<div id="dialog-manual-entry" title="Add work item" class='hidden'>
4040
<p class="validateTips">All form fields are required.</p>
4141
4242
<form id='form-manual-entry'>

0 commit comments

Comments
 (0)