Skip to content

Fix/194 #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Nov 16, 2022
Merged

Fix/194 #199

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
10be376
Merge pull request #3 from Hawiak/feature/use-enter-for-new-work-item
Hawiak Aug 20, 2022
e681b2a
Merge pull request #4 from Hawiak/feature/use-enter-for-new-work-item
Hawiak Aug 20, 2022
331d97d
Merge branch 'mtierltd:master' into master
Hawiak Oct 30, 2022
adbcf63
Fixed issue 194
Nov 8, 2022
d94e68c
Fixed issue 194 and cleared up debug code
Nov 8, 2022
bc6bf5c
Removed console logs
Nov 8, 2022
9f3bc59
Resolved conflicts
Nov 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed issue 194 and cleared up debug code
  • Loading branch information
Harm Akkerman committed Nov 8, 2022
commit d94e68c4f27a7cbbc215923ede31194897f4bd71
17 changes: 11 additions & 6 deletions js/src/timer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ function() {


$( function() {
$('#work-input-form').on('submit', function(e) {
e.preventDefault();
createWorkItem($(this));
});
var days='30';
var start = moment().startOf('day').subtract(29, 'days');
var end = moment().endOf('day');
Expand Down Expand Up @@ -278,7 +282,7 @@ function() {
"</div>"+
"<div class='wi-child-duration'>"+((child.running == 1)?'running...':secondsToTimer(child.duration))+"</div>"+
"<div class='wi-play-space'>"+
"<span class='fas clickable fa-play wi-play' id="+child.id+" data-work-name='"+child.name+"' data-projectid="+child.projectId+" data-tagids='"+child.tags.map(function(tag) {return tag.id}).join(',')+"' ></span>"+
"<span class='fas clickable fa-play wi-resume' id="+child.id+" data-work-name='"+child.name+"' data-projectid="+child.projectId+" data-tagids='"+child.tags.map(function(tag) {return tag.id}).join(',')+"' ></span>"+
"</div>"+
"</div>"+
"</div>"+
Expand Down Expand Up @@ -594,19 +598,19 @@ function() {
return false;
}

function startTimer(projectId = null, tags = ""){
function startTimer(projectId = null, tags = "", inputWorkName = null){
if(localStorage.getItem('isTimerStarted') === 'true'){
stopTimer(startTimer, [projectId, tags]);
stopTimer(startTimer, [projectId, tags, inputWorkName]);
return;
}
var workName = $('#work-input').val();
var workName = inputWorkName ?? $('#work-input').val();
if (workName == ''){
workName = 'no description';
}
var baseUrl = OC.generateUrl('/apps/timetracker/ajax/start-timer/'+encodeURIComponent(encodeURIComponent(workName)));
var jqxhr = $.post(baseUrl, { projectId: projectId, tags: tags}, function() {
})
.done(function(data, status, jqXHR) {
.done(function(data, status, jqxhr) {
var response = data;
if ('Error' in response){
alert(response.Error);
Expand Down Expand Up @@ -639,7 +643,7 @@ function() {
localStorage.setItem('isTimerStarted', false);
$('#start-tracking > span').addClass("play-button").removeClass("stop-button");
if (onStopped != null){
onStopped(args[0], args[1]);
onStopped(...args);
} else {
getWorkItems();
}
Expand All @@ -664,6 +668,7 @@ function() {
$('#start-tracking > span').addClass("play-button").removeClass("stop-button");
}
$( "#start-tracking" ).click(function() {
console.log("Start tracking test" + $(this).data('work-name'));
if(localStorage.getItem('isTimerStarted') === 'true'){
stopTimer();
} else {
Expand Down