From 2c5e7f250640c86fedc0ab83e42d381050fc37fa Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 17 Sep 2017 14:55:36 +0300 Subject: [PATCH] Working on time tracker app --- .../Controllers/TimeTrackerController.php | 20 ++++ app/Http/routes.php | 1 + resources/lang/en/texts.php | 2 + resources/views/time_tracker.blade.php | 93 +++++++++++++++++++ 4 files changed, 116 insertions(+) create mode 100644 app/Http/Controllers/TimeTrackerController.php create mode 100644 resources/views/time_tracker.blade.php diff --git a/app/Http/Controllers/TimeTrackerController.php b/app/Http/Controllers/TimeTrackerController.php new file mode 100644 index 000000000000..bacf1cc0e77e --- /dev/null +++ b/app/Http/Controllers/TimeTrackerController.php @@ -0,0 +1,20 @@ + Task::scope()->get(), + ]; + + return view('time_tracker', $data); + } +} diff --git a/app/Http/routes.php b/app/Http/routes.php index 7c5ce67e756f..2f59b05692a5 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -147,6 +147,7 @@ Route::group(['middleware' => ['lookup:user', 'auth:user']], function () { Route::post('clients/bulk', 'ClientController@bulk'); Route::get('clients/statement/{client_id}/{status_id?}/{start_date?}/{end_date?}', 'ClientController@statement'); + Route::get('time_tracker', 'TimeTrackerController@index'); Route::resource('tasks', 'TaskController'); Route::get('api/tasks/{client_id?}', 'TaskController@getDatatable'); Route::get('tasks/create/{client_id?}/{project_id?}', 'TaskController@create'); diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 3dbf3f623332..0d350ecf9a68 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -2448,6 +2448,8 @@ $LANG = array( 'calendar' => 'Calendar', 'pro_plan_calendar' => ':link to enable the calendar by joining the Pro Plan', + 'what_are_you_working_on' => 'What are you working on?', + ); return $LANG; diff --git a/resources/views/time_tracker.blade.php b/resources/views/time_tracker.blade.php new file mode 100644 index 000000000000..6ab0e3c75724 --- /dev/null +++ b/resources/views/time_tracker.blade.php @@ -0,0 +1,93 @@ +@extends('master') + +@section('head_css') + + + + +@stop + +@section('body') + + +
+ +
+ + + 14 + +
+

... + +

+
+
+ + + +@stop