Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Working on time tracker

Browse Source
This commit is contained in:
Hillel Coren 2017-09-26 12:46:23 +03:00
parent a89a0c5bfc
commit f807883d3f
4 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
resources/views/header.blade.php
View File

@ -37,6 +37,14 @@
}); });
} }
function openTimeTracker() {
var width = 1000;
var height = 800;
var left = (screen.width/2)-(width/4);
var top = (screen.height/2)-(height/1.5);
window.open("{{ url('/time_tracker') }}", "time-tracker", "width="+width+",height="+height+",scrollbars=no,toolbar=no,screenx="+left+",screeny="+top+",location=no,titlebar=no,directories=no,status=no,menubar=no");
}
window.loadedSearchData = false; window.loadedSearchData = false;
function onSearchBlur() { function onSearchBlur() {
$('#search').typeahead('val', ''); $('#search').typeahead('val', '');

1
resources/views/list.blade.php
View File

@ -100,6 +100,7 @@
}); });
}); });
</script> </script>
{!! Button::normal(trans('texts.time_tracker'))->asLinkTo('javascript:openTimeTracker()')->appendIcon(Icon::create('time')) !!}
@endif @endif
@if (Auth::user()->can('create', $entityType) && empty($vendorId)) @if (Auth::user()->can('create', $entityType) && empty($vendorId))

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

@ -485,7 +485,9 @@
toastr.info(message, false, options); toastr.info(message, false, options);
} }
sendKeepAlive(); if (model.isDesktop()) {
sendKeepAlive();
}
function setButtonSize() { function setButtonSize() {
if ($(window).width() > 350) { if ($(window).width() > 350) {
@ -500,7 +502,7 @@
setButtonSize(); setButtonSize();
$(window).on('beforeunload', function () { $(window).on('beforeunload', function () {
if (navigator.userAgent == 'Time Tracker') { if (model.isDesktop()) {
return undefined; return undefined;
} }
if (model.selectedTask() && model.formChanged()) { if (model.selectedTask() && model.formChanged()) {

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

@ -13,6 +13,10 @@
self.selectedClient = ko.observable(false); self.selectedClient = ko.observable(false);
self.selectedProject = ko.observable(false); self.selectedProject = ko.observable(false);
self.isDesktop = function() {
return navigator.userAgent == 'Time Tracker';
}
self.onSaveClick = function() { self.onSaveClick = function() {
if (! model.selectedTask() || ! model.formChanged()) { if (! model.selectedTask() || ! model.formChanged()) {
return; return;
@ -28,7 +32,16 @@
} }
self.onRefreshClick = function() { self.onRefreshClick = function() {
location.reload(); if (self.isDesktop()) {
if (model.selectedTask() && model.formChanged()) {
swal("{{ trans('texts.save_or_discard') }}");
return false;
} else {
location.reload();
}
} else {
location.reload();
}
} }
self.refreshTitle = function() { self.refreshTitle = function() {