Merge branch 'master' of https://github.com/kmanjari/hrms into new-branch

Author: Manjari1028

.DS_Store

@@ -24,10 +24,10 @@ class Wish extends Command
      */
     protected $description = 'sends an email wishing birthdays/work anniversary';
 
+
     /**
-     * Create a new command instance.
-     *
-     * @return void
+     * Wish constructor.
+     * @param Mailer $mailer
      */
     public function __construct(Mailer $mailer)
     {

.gitignore

@@ -4,5 +4,5 @@
 
 abstract class Event
 {
-    //
+   //
 }

app/.DS_Store

@@ -67,7 +67,12 @@ public function notFound()
         return view('hrms.auth.not_found');
     }
 
-    public function doRegister()
+    public function showRegister()
+    {
+        return view('hrms.auth.register');
+    }
+
+    public function doRegister(Request $request)
     {
         return view('hrms.auth.register');
     }

app/Award.php

@@ -303,12 +303,12 @@ public function uploadFile(Request $request)
                     if (empty($row->dob)) {
                         $attachment->date_of_birth = '0000-00-00';
                     } else {
-                        $attachment->date_of_birth = $row->dob;
+                        $attachment->date_of_birth = date('Y-m-d',strtotime($row->dob));
                     }
                     if (empty($row->doj)) {
                         $attachment->date_of_joining = '0000-00-00';
                     } else {
-                        $attachment->date_of_joining = $row->doj;
+                        $attachment->date_of_joining = date('Y-m-d', strtotime($row->doj));
                     }
                     if (empty($row->mob_number)) {
                         $attachment->number = '1234567890';
@@ -345,10 +345,10 @@ public function uploadFile(Request $request)
                     } else {
                         $attachment->permanent_address = $row->permanent_address;
                     }
-                    if (empty($row->formalities)) {
+                    if (empty($row->emp_formalities)) {
                         $attachment->formalities = '1';
                     } else {
-                        $attachment->formalities = $row->formalities;
+                        $attachment->formalities = $row->emp_formalities;
                     }
                     if (empty($row->offer_acceptance)) {
                         $attachment->offer_acceptance = '1';
@@ -363,7 +363,7 @@ public function uploadFile(Request $request)
                     if (empty($row->doc)) {
                         $attachment->date_of_confirmation = '0000-00-00';
                     } else {
-                        $attachment->date_of_confirmation = $row->doc;
+                        $attachment->date_of_confirmation = date('Y-m-d', strtotime($row->doc));
                     }
                     if (empty($row->department)) {
                         $attachment->department = 'Not Exist';
@@ -408,7 +408,7 @@ public function uploadFile(Request $request)
                     if (empty($row->dor)) {
                         $attachment->date_of_resignation = '0000-00-00';
                     } else {
-                        $attachment->date_of_resignation = $row->dor;
+                        $attachment->date_of_resignation = date('Y-m-d', strtotime($row->dor));
                     }
                     if (empty($row->notice_period)) {
                         $attachment->notice_period = 'Not exist';
@@ -418,7 +418,7 @@ public function uploadFile(Request $request)
                     if (empty($row->last_working_day)) {
                         $attachment->last_working_day = '0000-00-00';
                     } else {
-                        $attachment->last_working_day = $row->last_working_day;
+                        $attachment->last_working_day = date('Y-m-d', strtotime($row->last_working_day));
                     }
                     if (empty($row->full_final)) {
                         $attachment->full_final = 'Not exist';

app/Awardee.php

@@ -3,25 +3,61 @@
 namespace App\Http\Controllers;
 
 use App\Models\Client;
+use App\Models\Employee;
 use App\Models\Project;
 use Illuminate\Http\Request;
 use App\User;
 use App\Models\AssignProject;
-use App\Models\Employee;
 
 use App\Http\Requests;
 
 class ProjectController extends Controller
 {
     public function addProject()
     {
-//        $clients = User::whereHas('role', function ($q) {
-//            $q->where('role_id', '5');
-//        })->get();
-      //  $clients = Client::get();
-        $clients= client::lists('name', 'id');
 
-        return view('hrms.project.add-project', compact('clients'));
+        $model = new \stdClass();
+        $model->clients = Client::get();
+        return view('hrms.projects.add', compact('model'));
+    }
+
+    public function saveProject(Requests\AddProjectRequest $request)
+    {
+        $project = new Project();
+        $project->fill(array_except($request->all(), '_token'));
+        $project->save();
+
+        \Session::flash('flash_message', 'Project added successfully');
+
+        return redirect()->back();
+    }
+
+    public function showEdit($projectId)
+    {
+        $model = new \stdClass();
+        $model->project = Project::with('client')->findOrFail(['id' => $projectId]);
+        $model->clients = Client::get();
+        return view('hrms.projects.edit', compact('model'));
+    }
+
+    public function listProject()
+    {
+        $projects = Project::with('client')->paginate(15);
+        return view('hrms.projects.list', compact('projects'));
+    }
+
+    public function assignProject()
+    {
+        $model = new \stdClass();
+        $model->projects = Project::get();
+        $model->employees = Employee::whereHas('userrole', function($q)
+        {
+            $q->whereIn('role_id', ['3', '4']);
+        })
+            ->get();
+
+        return view('hrms.projects.assign', compact('model'));
+
     }
 
     public function validateCode($code)
@@ -47,36 +83,6 @@ public function processProject(Request $request)
         return redirect()->back();
     }
 
-    public function saveProject(Request $request)
-    {
-        $project = new Project;
-        $project->name = $request->project_name;
-        $project->code= $request->code;
-        $project->description = $request->description;
-        $project->client_id = $request->client_id;
-        $project->save();
-        \Session::flash('flash_message', 'project successfully added');
-        return redirect()->back();
-
-    }
-    public function listProject()
-    {
-        $projects = project::paginate(5);
-        return view('hrms.project.show-project', compact('projects'));
-    }
-    public function showEdit($id)
-    {
-        $results = Client::get();
-        $clients = [];
-        foreach($results as $result)
-        {
-            $clients[$result->id] = $result->name;
-        }
-
-        $result = project::whereid($id)->first();
-        return view('hrms.project.add-project', compact('result', 'clients'));
-    }
-
     public function doEdit(Request $request, $id)
     {
         $name = $request->name;

app/Console/Commands/Wish.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Requests;
+
+use App\Http\Requests\Request;
+
+class AddProjectRequest extends Request
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'name' => 'required',
+            'client_id' => 'required'
+        ];
+    }
+}

app/Events/Event.php

@@ -24,12 +24,11 @@
 
     Route::post('reset-password', 'AuthController@processPasswordReset');
 
-    Route::get('register', 'AuthController@doRegister');
+    Route::get('register', 'AuthController@showRegister');
 
 
 });
 
-
 Route::group(['middleware' => ['auth']], function ()
 {
 
@@ -289,7 +288,7 @@
 
     Route::get('post/{id}', 'UpdateController@post');
 
-    /** Routes for clients */
+    /** Routes for clients **/
     Route::get('add-client', 'ClientController@addClient')->name('add-client');
 
     Route::post('add-client', 'ClientController@saveClient');
@@ -304,14 +303,17 @@
     Route::get('delete-list/{clientId}', 'ClientController@doDelete');
 
 
+    /** Routes for projects **/
     Route::get('validate-code/{code}', 'ClientController@validateCode');
 
-    /** Routes for projects */
-
     Route::get('add-project', 'ProjectController@addProject')->name('add-project');
 
     Route::post('add-project', 'ProjectController@saveProject');
 
+    Route::get('edit-project/{projectId}', 'ProjectController@showEdit')->name('edit-project');
+
+    Route::post('edit-project/{projectId}', 'ProjectController@saveProjectEdit');
+
     Route::get('list-project', 'ProjectController@listProject')->name('list-project');
 
     Route::get('edit-project/{id}', ['as' => 'edit-project', 'uses' => 'ProjectController@showEdit']);
@@ -326,6 +328,7 @@
 
     Route::get('project-assignment-listing', ['as' => 'project-assignment-listing', 'uses' => 'ProjectController@showProjectAssignment']);
 
+
     Route::get('edit-project-assignment/{id}', ['as' => 'edit-project-assignment', 'uses' => 'ProjectController@showEditAssign']);
 
     Route::post('edit-project-assignment/{id}', ['as' => 'edit-project-assignment', 'uses' => 'ProjectController@doEditAssign']);
@@ -335,5 +338,4 @@
 
     //Route::get('assign-project', 'ProjectController@assignProject')->name('assign-project');
 
-
 });

app/Expense.php

@@ -1,10 +1,15 @@
 <?php
 
-namespace App\Models;
+    namespace App\Models;
 
-use Illuminate\Database\Eloquent\Model;
+    use Illuminate\Database\Eloquent\Model;
 
-class Project extends Model
-{
+    class Project extends Model
+    {
+        protected $guarded = [];
 
-}
+        public function client()
+        {
+            return $this->belongsTo(Client::class);
+        }
+    }

app/Http/.DS_Store

@@ -150,7 +150,7 @@
         Collective\Html\HtmlServiceProvider::class,
         Maatwebsite\Excel\ExcelServiceProvider::class,
         Collective\Html\HtmlServiceProvider::class,
-        \App\Providers\ViewShareServiceProvider::class,
+        //\App\Providers\ViewShareServiceProvider::class,
 
 
         /*

app/Http/Controllers/AuthController.php

@@ -56,8 +56,8 @@
             'driver' => 'mysql',
             'host' => env('DB_HOST', 'localhost'),
             'port' => env('DB_PORT', '3306'),
-            'database' => env('DB_DATABASE', 'forge'),
-            'username' => env('DB_USERNAME', 'forge'),
+            'database' => env('DB_DATABASE', 'hrms'),
+            'username' => env('DB_USERNAME', 'root'),
             'password' => env('DB_PASSWORD', ''),
             'charset' => 'utf8',
             'collation' => 'utf8_unicode_ci',

app/Http/Controllers/AwardController.php

@@ -12,8 +12,7 @@ class CreateAssignAssetsTable extends Migration
      */
     public function up()
     {
-        Schema::create('a        Schema::drop(\'assign_assets\');
-ssign_assets', function (Blueprint $table) {
+        Schema::create('assign_assets', function (Blueprint $table) {
             $table->increments('id');
             $table->integer('user_id')->unsigned();
             $table->integer('asset_id')->unsigned();

app/Http/Controllers/ClientController.php

@@ -17,7 +17,7 @@ public function up()
             $table->string('name');
             $table->text('description');
             $table->string('code');
-            //$table->integer('client_id')->unsigned();
+            $table->integer('client_id')->unsigned();
             $table->foreign('client_id')->references('id')->on('clients')->onDelete('cascade');
             $table->timestamps();
         });