Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Working on time tracker

Browse Source
This commit is contained in:
Hillel Coren 2017-09-25 11:52:57 +03:00
parent 6a94c45b43
commit 4714cd7595
9 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bower.json
View File

@ -36,7 +36,8 @@
"mousetrap": "^1.6.0",
"tablesorter": "jquery.tablesorter#^2.28.4",
"card": "^2.1.1",
"fullcalendar": "^3.5.1"
"fullcalendar": "^3.5.1",
"toastr": "^2.1.3"
},
"resolutions": {
"jquery": "~1.11"

2
gulpfile.js
View File

@ -50,6 +50,7 @@ elixir(function(mix) {
bowerDir + '/dropzone/dist/dropzone.css',
bowerDir + '/spectrum/spectrum.css',
bowerDir + '/sweetalert2/dist/sweetalert2.css',
bowerDir + '/toastr/toastr.css',
'bootstrap-combobox.css',
'typeahead.js-bootstrap.css',
'style.css',
@ -156,6 +157,7 @@ elixir(function(mix) {
//bowerDir + '/sweetalert/dist/sweetalert-dev.js',
bowerDir + '/nouislider/distribute/nouislider.js',
bowerDir + '/mousetrap/mousetrap.js',
bowerDir + '/toastr/toastr.js',
bowerDir + '/fuse.js/src/fuse.js',
'bootstrap-combobox.js',
'script.js',

5
public/built.js
View File

File diff suppressed because one or more lines are too long

2
public/built.js.map
View File

File diff suppressed because one or more lines are too long

4
public/css/built.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/css/built.css.map
View File

File diff suppressed because one or more lines are too long

1
resources/lang/en/texts.php
View File

@ -2457,6 +2457,7 @@ $LANG = array(
'save_or_discard' => 'Save or discard your changes',
'discard_changes' => 'Discard Changes',
'tasks_not_enabled' => 'Tasks are not enabled.',
'started_task' => 'Successfully started task',
);

4
resources/views/tasks/time_tracker.blade.php
View File

@ -362,6 +362,9 @@
model.onArchiveClick();
});
toastr.options.timeOut = 3000;
toastr.options.positionClass = 'toast-bottom-right';
/*
$(window).on('beforeunload', function () {
console.log('beforeunload');
@ -381,6 +384,7 @@
$('.footer').
});
*/
});
</script>

26
resources/views/tasks/time_tracker_knockout.blade.php
View File

@ -51,9 +51,14 @@
self.removeTask(task);
self.selectTask(false);
}
if (action == 'archive') {
toastr.success("{{ trans('texts.archived_task') }}");
} else if (action == 'delete') {
toastr.success("{{ trans('texts.deleted_task') }}");
}
},
error: function(error) {
console.log(error);
toastr.error("{{ trans('texts.error_refresh_page') }}");
}
});
}
@ -384,13 +389,32 @@
addProjectToMaps(project);
refreshProjectList();
}
var isNew = !self.public_id();
self.update(response);
model.formChanged(false);
if (isNew) {
toastr.success("{{ trans('texts.created_task') }}");
} else {
toastr.success("{{ trans('texts.updated_task') }}");
}
} else {
if (self.isRunning()) {
if (self.time_log().length == 1) {
toastr.success("{{ trans('texts.started_task') }}");
} else {
toastr.success("{{ trans('texts.resumed_task') }}");
}
} else {
toastr.success("{{ trans('texts.stopped_task') }}");
}
}
setTimeout(function() {
self.isStartEnabled(true);
}, 2000);
},
error: function(error) {
toastr.error("{{ trans('texts.error_refresh_page') }}");
},
});
}