Skip to content

Feature/use enter for new work item #187

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
mtierltd merged 13 commits into from
Oct 26, 2022
Merged

Feature/use enter for new work item #187

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
36ffe29
Include library for dev purposes
Jun 1, 2022
5396c96
Implemented cost field in workitem and display it in dashboard and re…
Jun 1, 2022
be5d3ed
Merge pull request #2 from Hawiak/feature/cost
Hawiak Jun 14, 2022
5d436f0
Merge pull request #1 from Hawiak/fix/163_fix-project-search
Hawiak Jun 14, 2022
4ca39ba
Use enter to create a new timeline entry
Jul 23, 2022
e2532f2
Merge branch 'master' into feature/use-enter-for-new-work-item
Jul 26, 2022
a0db396
Updated migration
Jul 26, 2022
283fe8d
Merge branch 'master' into feature/use-enter-for-new-work-item
Jul 26, 2022
063c5a1
Fixed client search and enabled fuzzy search
Jul 26, 2022
51f2ed6
Merge branch 'master' into feature/use-enter-for-new-work-item
Hawiak Jul 26, 2022
4f0113f
Enable usage of a comma within cost field
Aug 19, 2022
bce60c2
Merge branch 'feature/use-enter-for-new-work-item' of https://github.…
Aug 19, 2022
baae5a7
Fixed title for submitting with enter
Aug 20, 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
Fixed title for submitting with enter
  • Loading branch information
Harm Akkerman committed Aug 20, 2022
commit baae5a744eb1c937f38b2b92e1b6843de525c62d
15 changes: 9 additions & 6 deletions js/src/timer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,17 +580,20 @@ function() {
}

function createWorkItem() {
$('#work-input').val($(this).data('work-name'));
startTimer($(this).data('projectid'), $(this).data('tagids'));
var wiPlay = $('.wi-play');
var workName = $('#work-input').val();

$('#work-input').val(wiPlay.data('work-name'));
startTimer(wiPlay.data('projectid'), wiPlay.data('tagids'), workName);
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';
}
Expand Down Expand Up @@ -630,7 +633,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 Down