Merge branch 'ui-ux-improvements' of git://github.com/damms005/free-pmo into damms005-ui-ux-improvements

.gitignore

@@ -6,3 +6,4 @@ Homestead.json
 .env
 /.idea/
 .php_cs.cache
+/.vscode

app/Http/Requests/Jobs/CreateRequest.php

@@ -26,14 +26,24 @@ class CreateRequest extends Request
      */
     public function rules()
     {
-        return [
+        $rules = [
             'name'              => 'required|max:60',
             'price'             => 'required|numeric',
             'worker_id'         => 'required|numeric',
             'type_id'           => 'required|numeric',
             'target_start_date' => 'nullable|date|date_format:Y-m-d',
             'target_end_date'   => 'nullable|date|date_format:Y-m-d',
-            'description'       => 'max:255',
         ];
+
+        //Allow for flexibility instead of optionless hard-coded value for "description". This is
+        //achieved using environmental variable.
+        //A value of zero (0) will mean "no limit"
+
+        $char_len_job_description = intval(env('CHAR_LEN_JOB_DESCRIPTION', 255));
+        if ($char_len_job_description > 0) {
+            $rules['description'] = "max:$char_len_job_description";
+        }
+
+        return $rules;
     }
 }

app/Http/Requests/Jobs/UpdateRequest.php

@@ -26,12 +26,22 @@ class UpdateRequest extends Request
      */
     public function rules()
     {
-        return [
+        $rules = [
             'name'      => 'required|max:60',
             'price'     => 'required|numeric',
             'worker_id' => 'required|numeric',
             'type_id'   => 'required|numeric',
-            'description' => 'max:255',
         ];
+
+        //Allow for flexibility instead of optionless hard-coded value for "description". This is
+        //achieved using environmental variable.
+        //A value of zero (0) will mean "no limit"
+
+        $char_len_job_description = intval(env('CHAR_LEN_JOB_DESCRIPTION', 255));
+        if ($char_len_job_description > 0) {
+            $rules['description'] = "max:$char_len_job_description";
+        }
+
+        return $rules;
     }
 }

app/Http/Requests/Projects/CreateRequest.php

@@ -24,15 +24,25 @@ class CreateRequest extends Request
      */
     public function rules()
     {
-        return [
+        $rules = [
             'name'           => 'required|max:50',
             'proposal_date'  => 'nullable|date|date_format:Y-m-d',
             'proposal_value' => 'nullable|numeric',
             'customer_id'    => 'nullable|numeric',
             'customer_name'  => 'nullable|required_without:customer_id|max:60',
             'customer_email' => 'nullable|required_without:customer_id|email|unique:users,email',
-            'description'    => 'nullable|max:255',
         ];
+
+        //Allow for flexibility instead of optionless hard-coded value for "description". This is
+        //achieved using environmental variable.
+        //A value of zero (0) will mean "no limit"
+
+        $char_len_project_description = intval(env('CHAR_LEN_PROJECT_DESCRIPTION', 255));
+        if ($char_len_project_description > 0) {
+            $rules['description'] = "max:$char_len_project_description";
+        }
+
+        return $rules;
     }
 
     /**

app/Http/Requests/Projects/UpdateRequest.php

@@ -26,9 +26,8 @@ class UpdateRequest extends Request
      */
     public function rules()
     {
-        return [
+        $rules = [
             'name'           => 'required|max:50',
-            'description'    => 'nullable|max:255',
             'proposal_date'  => 'nullable|date|date_format:Y-m-d',
             'proposal_value' => 'nullable|numeric',
             'start_date'     => 'nullable|date|date_format:Y-m-d',
@@ -38,5 +37,16 @@ class UpdateRequest extends Request
             'customer_id'    => 'nullable|numeric',
             'status_id'      => 'required|numeric',
         ];
+
+        //Allow for flexibility instead of optionless hard-coded value for "description". This is
+        //achieved using environmental variable.
+        //A value of zero (0) will mean "no limit"
+
+        $char_len_project_description = intval(env('CHAR_LEN_PROJECT_DESCRIPTION', 255));
+        if ($char_len_project_description > 0) {
+            $rules['description'] = "max:$char_len_project_description";
+        }
+
+        return $rules;
     }
 }

app/Http/Requests/Tasks/CreateRequest.php

@@ -24,10 +24,20 @@ class CreateRequest extends Request
      */
     public function rules()
     {
-        return [
+        $rules = [
             'name'     => 'required|max:60',
-            'description' => 'nullable|max:255',
             'progress' => 'required|numeric|max:100',
         ];
+
+        //Allow for flexibility instead of optionless hard-coded value for "description". This is
+        //achieved using environmental variable.
+        //A value of zero (0) will mean "no limit"
+
+        $char_len_task_description = intval(env('CHAR_LEN_TASK_DESCRIPTION', 255));
+        if ($char_len_task_description > 0) {
+            $rules['description'] = "max:$char_len_task_description";
+        }
+
+        return $rules;
     }
 }

app/Http/Requests/Tasks/UpdateRequest.php

@@ -25,11 +25,21 @@ class UpdateRequest extends Request
      */
     public function rules()
     {
-        return [
+        $rules = [
             'name'     => 'required|max:60',
-            'description' => 'nullable|max:255',
             'progress' => 'required|numeric|max:100',
             'job_id'   => 'required|numeric|exists:jobs,id',
         ];
+
+        //Allow for flexibility instead of optionless hard-coded value for "description". This is
+        //achieved using environmental variable.
+        //A value of zero (0) will mean "no limit"
+
+        $char_len_task_description = intval(env('CHAR_LEN_TASK_DESCRIPTION', 255));
+        if ($char_len_task_description > 0) {
+            $rules['description'] = "max:$char_len_task_description";
+        }
+
+        return $rules;
     }
 }

composer.json

@@ -7,12 +7,13 @@
     "require": {
         "php": "^7.1.3",
         "backup-manager/laravel": "^1.2",
-        "laracasts/presenter": "^0.2.1",
+        "doctrine/dbal": "^2.9",
         "fideloper/proxy": "^4.0",
+        "laracasts/presenter": "^0.2.1",
         "laravel/framework": "5.7.*",
         "luthfi/formfield": "^1.0",
         "riskihajar/terbilang": "^1.2",
-        "spatie/laravel-fractal": "^5.0"
+        "spatie/laravel-fractal": "<5.5"
     },
 
     "require-dev": {

config/app.php

@@ -13,7 +13,7 @@ return [
     |
     */
 
-    'name' => 'Free PMO',
+    'name' => 'Anchis & Kolbins',
 
     /*
     |--------------------------------------------------------------------------

database/migrations/2019_06_10_143715_update_projects_table_remove_char_len_limit_of_description_col.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class UpdateProjectsTableRemoveCharLenLimitOfDescriptionCol extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('projects', function (Blueprint $table) {
+            $table->text('description')->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('projects', function (Blueprint $table) {
+            $table->string('description')->nullable()->change();
+        });
+    }
+}

database/migrations/2019_06_10_144559_update_jobs_table_remove_char_len_limit_of_description_col.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class UpdateJobsTableRemoveCharLenLimitOfDescriptionCol extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('jobs', function (Blueprint $table) {
+            $table->text('description')->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('jobs', function (Blueprint $table) {
+            $table->string('description')->nullable()->change();
+        });
+    }
+}

database/migrations/2019_06_10_145351_update_tasks_table_remove_char_len_limit_of_description_col.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class UpdateTasksTableRemoveCharLenLimitOfDescriptionCol extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('tasks', function (Blueprint $table) {
+            $table->text('description')->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('tasks', function (Blueprint $table) {
+            $table->string('description')->nullable()->change();
+        });
+    }
+}

resources/views/jobs/edit.blade.php

@@ -29,7 +29,7 @@
                     <div class="col-md-4">{!! FormField::text('actual_start_date', ['label' => __('job.actual_start_date'), 'class' => 'date-select']) !!}</div>
                     <div class="col-md-4">{!! FormField::text('actual_end_date', ['label' => __('job.actual_end_date'), 'class' => 'date-select']) !!}</div>
                 </div>
-                {!! FormField::textarea('description', ['label' => __('job.description')]) !!}
+                {!! FormField::textarea('description', ['label' => __('job.description') , 'class' => 'countable']) !!}
             </div>
 
             <div class="panel-footer">

resources/views/jobs/partials/job-tasks.blade.php

@@ -98,7 +98,7 @@
                 <strong id="ap_weight">0</strong>%
             </div>
         </div>
-        {!! FormField::textarea('description', ['label' => __('task.description')]) !!}
+        {!! FormField::textarea('description', ['label' => __('task.description') , 'class' => 'countable']) !!}
         {{ Form::submit(__('task.create'), ['class' => 'btn btn-primary']) }}
         {{ Form::close() }}
     </div>

resources/views/layouts/app.blade.php

@@ -11,6 +11,15 @@
 
     @yield('ext_css')
     {!! Html::style('assets/css/app.css') !!}
+    {!! Html::style('assets/css/bootstrap-v3.4.0.min.css') !!}
+    {!! Html::style('assets/css/sb-admin-2.min.css') !!}
+
+    <style>
+
+.sidebar {
+     margin-top: 0px;
+}
+    </style>
 </head>
 <body>
     <div id="wrapper">
@@ -30,6 +39,7 @@
 
     {!! Html::script(url('assets/js/jquery.js')) !!}
     {!! Html::script(url('assets/js/bootstrap.min.js')) !!}
+    {!! Html::script(url('assets/js/textcounter.min.js')) !!}
     @include('layouts.partials.noty')
     {!! Html::script(url('assets/js/plugins/metisMenu/metisMenu.min.js')) !!}
     @yield('ext_js')
@@ -47,6 +57,13 @@
             }
         });
     })();
+
+    $(function(){
+        $('.countable').textcounter({
+            max: 1024, //just an arbitrary default
+        	stopInputAtMaximum: false
+        });
+    });
     </script>
 
     @yield('script')

resources/views/layouts/partials/lang-switcher.blade.php

@@ -1,7 +1,8 @@
-<div class="text-center" style="border-bottom: 1px solid #e7e7e7; padding-bottom: 10px">
-    {{ trans('lang.lang') }} :
+<div class="text-center" style="border-bottom: 1px solid #e7e7e7; padding: 90px 10px 0px 0px">
+    {{-- {{ trans('lang.lang') }} : --}}
 
     @foreach (['en', 'id', 'de'] as $langKey)
+        {{-- @break --}}
         {!! FormField::formButton(
             [
                 'route'  => 'users.profile.switch-lang',

resources/views/projects/create.blade.php

@@ -15,7 +15,7 @@
             <div class="panel-heading"><h3 class="panel-title">{{ trans('project.create') }}</h3></div>
             <div class="panel-body">
                 {!! FormField::text('name', ['label' => trans('project.name')]) !!}
-                {!! FormField::select('customer_id', $customers, ['placeholder' => 'Customer Baru']) !!}
+                {!! FormField::select('customer_id', $customers, ['placeholder' => 'New Customer']) !!}
                 <div class="row">
                     <div class="col-md-6">
                         {!! FormField::text('customer_name') !!}
@@ -32,7 +32,7 @@
                         {!! FormField::price('proposal_value', ['label' => trans('project.proposal_value'), 'currency' => Option::get('money_sign', 'Rp')]) !!}
                     </div>
                 </div>
-                {!! FormField::textarea('description', ['label' => trans('project.description')]) !!}
+                {!! FormField::textarea('description', ['label' => trans('project.description') , 'class' => 'countable']) !!}
             </div>
 
             <div class="panel-footer">

resources/views/projects/edit.blade.php

@@ -15,7 +15,7 @@
                 {!! FormField::text('name', ['label' => __('project.name')]) !!}
                 <div class="row">
                     <div class="col-md-8">
-                        {!! FormField::textarea('description', ['label' => __('project.description'),'rows' => 5]) !!}
+                        {!! FormField::textarea('description', ['label' => __('project.description'),'rows' => 5 , 'class' => 'countable']) !!}
                     </div>
                     <div class="col-md-4">
                         {!! FormField::price('proposal_value', ['label' => __('project.proposal_value'), 'currency' => Option::get('money_sign', 'Rp')]) !!}

resources/views/projects/jobs/create.blade.php

@@ -37,7 +37,7 @@
                     <div class="col-md-4">{!! FormField::text('target_start_date', ['label' => __('job.target_start_date'), 'class' => 'date-select']) !!}</div>
                     <div class="col-md-4">{!! FormField::text('target_end_date', ['label' => __('job.target_end_date'), 'class' => 'date-select']) !!}</div>
                 </div>
-                {!! FormField::textarea('description', ['label' => __('job.description')]) !!}
+                {!! FormField::textarea('description', ['label' => __('job.description') , 'class' => 'countable']) !!}
             </div>
 
             <div class="panel-footer">

routes/web.php

@@ -1,5 +1,7 @@
 <?php
 
+//upload table issues
+
 require __DIR__.'/web/pages.php';
 require __DIR__.'/web/users.php';
 require __DIR__.'/web/references.php';