Vijayakrishnan пре 4 година
родитељ
комит
cfc0f3e381

+ 7 - 5
app/Http/Controllers/pros_SINGLE_Controller.php

@@ -422,6 +422,7 @@ class pros_SINGLE_Controller extends Controller
 		return response()->view('admin/pros_SINGLE/ACTION_setProType', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
+	// GET /pros/view/{uid}/ACTION_setInitiative
 	public function ACTION_setInitiative(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
 		if(!$record) {
@@ -431,6 +432,7 @@ class pros_SINGLE_Controller extends Controller
 		return response()->view('admin/pros_SINGLE/ACTION_setInitiative', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
+	// GET /pros/view/{uid}/ACTION_putProMemo
 	public function ACTION_putProMemo(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
 		if(!$record) {
@@ -490,7 +492,7 @@ class pros_SINGLE_Controller extends Controller
 			$record = DB::table('pro')->where('id', $uid)->first();
 			if($record) return redirect('/pros/view/' . $record->uid . '/SUB_pro_access');
 		}
-		$subRecords = DB::table('client_pro_access')->where('pro_id', $record->id)->get();
+		$subRecords = DB::table('pro_pro_access')->where('owner_pro_id', $record->id)->get();
 		return response()->view('admin/pros_SINGLE/SUB_pro_access', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
@@ -634,14 +636,14 @@ class pros_SINGLE_Controller extends Controller
 		return response()->view('admin/pros_SINGLE/ACTION_add_new_note_template_pro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
-	// GET /pros/view/{uid}/ACTION_add_new_client_pro_access
-	public function ACTION_add_new_client_pro_access(Request $request, $uid) {
+	// GET /pros/view/{uid}/ACTION_add_new_pro_pro_access
+	public function ACTION_add_new_pro_pro_access(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
 		if(!$record) {
 			$record = DB::table('pro')->where('id', $uid)->first();
-			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_add_new_client_pro_access');
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_add_new_pro_pro_access');
 		}
-		return response()->view('admin/pros_SINGLE/ACTION_add_new_client_pro_access', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		return response()->view('admin/pros_SINGLE/ACTION_add_new_pro_pro_access', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_add_new_credit_pro_transaction

+ 9 - 8
generatecv/tree.txt

@@ -1110,13 +1110,14 @@ ADMIN
                     noteTemplateUid:record:note_template:uid,title
             clients
             pro_access
-                id=client_pro_access.pro_id=>/pro_access/view/UID
-                add_new:client_pro_access=>/pro_access/view/UID
-                    proUid:hidden=uid
-                    clientUid:record:client:uid,name_first
-                    reasonCategory
-                    reasonMemo
-                    reasonDetail
+                id=pro_pro_access.owner_pro_id=>/pro_access/view/UID
+                add_new:pro_pro_access=>/pro_access/view/UID
+                    ownerProUid:hidden=uid
+                    accessibleProUid:record:pro:uid,name_first
+                    memo
+                    canAssignAsRme:bool
+                    canAssignAsRmm:bool
+                    canAssignAsMcp:bool
             mcp_updates
             erx
             action_items
@@ -1406,4 +1407,4 @@ ADMIN
     mb_pro|mb_pro|view|icon:tablet-alt
     mb_pro/view/{uid}
     mb_claim|mb_claim|view|icon:tablet-alt
-    mb_claim/view/{uid}
+    mb_claim/view/{uid}

+ 67 - 0
resources/views/admin/pros_SINGLE/ACTION_add_new_pro_pro_access.blade.php

@@ -0,0 +1,67 @@
+@extends('admin.pros.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3 stag-heading stag-heading-modal">
+        <div>Add New Pro Pro Access</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="#" up-close>
+                <i class="fa fa-times"></i>
+            </a>
+        </div>
+    </h4>
+
+    <form action="/post-to-api"
+          up-target="#main-content" up-history="false" up-fail-target=".failed-form-contents" up-reveal="false"
+          method="post" enctype="multipart/form-data"
+          class="border-top px-3 pt-3 pb-1 custom-submit">
+        @csrf
+
+        @if (session('message'))
+            <div class="alert alert-danger">{{ session('message') }}</div>
+        @endif
+
+        <input type="hidden" name="_uid" value="{{ $record->uid }}">
+        <input type="hidden" name="_api" value="/api/proProAccess/create">
+        <input type="hidden" name="_success" value="{{route('pros_SINGLE-SUB_pro_access', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('pros_SINGLE-ACTION_add_new_pro_pro_access', ['uid' => $record->uid])}}">
+        <input class='form-control' type='hidden' name='ownerProUid' value='{{ old('ownerProUid') ? old('ownerProUid') : $record->uid }}' >
+<div class='form-group mb-3'>
+<label class='control-label'>Accessible Pro </label>
+<select class='form-control' name='accessibleProUid' value='{{ old('accessibleProUid') ? old('accessibleProUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('accessibleProUid') ? old('accessibleProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_first ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Memo </label>
+<input class='form-control' type='text' name='memo' value='{{ old('memo') ? old('memo') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Can Assign As Rme 
+<input class='ml-2' type='checkbox' name='canAssignAsRme' >
+</label>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Can Assign As Rmm 
+<input class='ml-2' type='checkbox' name='canAssignAsRmm' >
+</label>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Can Assign As Mcp 
+<input class='ml-2' type='checkbox' name='canAssignAsMcp' >
+</label>
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('pros_SINGLE-SUB_pro_access', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 23 - 17
resources/views/admin/pros_SINGLE/SUB_pro_access.blade.php

@@ -6,7 +6,7 @@
         <h5 class='my-3 d-flex stag-heading stag-heading-sub'>
             <div>Pro Access</div>
             <div class="ml-auto">
-                <a class="btn btn-primary btn-sm ml-2" up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href="{{route('pros_SINGLE-ACTION_add_new_client_pro_access', ['uid' => $record->uid])}}?optimised=1"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
+                <a class="btn btn-primary btn-sm ml-2" up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href="{{route('pros_SINGLE-ACTION_add_new_pro_pro_access', ['uid' => $record->uid])}}?optimised=1"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
             </div>
         </h5>
 
@@ -15,40 +15,46 @@
                 <thead>
                 <tr>
                     <th>&nbsp;</th>
+<th>Owner Pro Id</th>
+<th>Accessible Pro Id</th>
+<th>Memo</th>
+<th>Can Assign As Rme</th>
+<th>Can Assign As Rmm</th>
+<th>Can Assign As Mcp</th>
 <th>Created At</th>
+<th>Created By Session Id</th>
 <th>Type</th>
+<th>Is Active</th>
 <th>Deactivated At</th>
+<th>Deactivated By Session Id</th>
 <th>Deactivation Memo</th>
-<th>Is Active</th>
 <th>Reactivated At</th>
-<th>Reactivation Memo</th>
-<th>Reason Category</th>
-<th>Reason Memo</th>
-<th>Created By Session Id</th>
-<th>Deactivated By Session Id</th>
 <th>Reactivated By Session Id</th>
-<th>Client Id</th>
-<th>Pro Id</th>
+<th>Reactivation Memo</th>
+<th>Can Book Appointments</th>
                 </tr>
                 </thead>
                 <tbody>
                 @foreach($subRecords as $subRecord)
                     <tr>
                         <td><a href="/pro_access/view/{{ $subRecord->uid }}"><i class="fas fa-share-square"></i></a></td>
+<td><?= $subRecord->owner_pro_id ?></td>
+<td><?= $subRecord->accessible_pro_id ?></td>
+<td><?= $subRecord->memo ?></td>
+<td><?= $subRecord->can_assign_as_rme ?></td>
+<td><?= $subRecord->can_assign_as_rmm ?></td>
+<td><?= $subRecord->can_assign_as_mcp ?></td>
 <td><?= friendly_date_time($subRecord->created_at) ?></td>
+<td><?= $subRecord->created_by_session_id ?></td>
 <td><?= $subRecord->type ?></td>
+<td><?= $subRecord->is_active ?></td>
 <td><?= friendly_date_time($subRecord->deactivated_at) ?></td>
+<td><?= $subRecord->deactivated_by_session_id ?></td>
 <td><?= $subRecord->deactivation_memo ?></td>
-<td><?= $subRecord->is_active ?></td>
 <td><?= friendly_date_time($subRecord->reactivated_at) ?></td>
-<td><?= $subRecord->reactivation_memo ?></td>
-<td><?= $subRecord->reason_category ?></td>
-<td><?= $subRecord->reason_memo ?></td>
-<td><?= $subRecord->created_by_session_id ?></td>
-<td><?= $subRecord->deactivated_by_session_id ?></td>
 <td><?= $subRecord->reactivated_by_session_id ?></td>
-<td><?= $subRecord->client_id ?></td>
-<td><?= $subRecord->pro_id ?></td>
+<td><?= $subRecord->reactivation_memo ?></td>
+<td><?= $subRecord->can_book_appointments ?></td>
                     </tr>
                 @endforeach
                 </tbody>

+ 1 - 1
routes/generated.php

@@ -413,7 +413,7 @@ Route::prefix('/pros/view/{uid}')->group(function () {
 	Route::get('SUB_audit_log', 'pros_SINGLE_Controller@SUB_audit_log')->name('pros_SINGLE-SUB_audit_log');
 	Route::get('ACTION_add_new_pro_rate', 'pros_SINGLE_Controller@ACTION_add_new_pro_rate')->name('pros_SINGLE-ACTION_add_new_pro_rate');
 	Route::get('ACTION_add_new_note_template_pro', 'pros_SINGLE_Controller@ACTION_add_new_note_template_pro')->name('pros_SINGLE-ACTION_add_new_note_template_pro');
-	Route::get('ACTION_add_new_client_pro_access', 'pros_SINGLE_Controller@ACTION_add_new_client_pro_access')->name('pros_SINGLE-ACTION_add_new_client_pro_access');
+	Route::get('ACTION_add_new_pro_pro_access', 'pros_SINGLE_Controller@ACTION_add_new_pro_pro_access')->name('pros_SINGLE-ACTION_add_new_pro_pro_access');
 	Route::get('ACTION_add_new_credit_pro_transaction', 'pros_SINGLE_Controller@ACTION_add_new_credit_pro_transaction')->name('pros_SINGLE-ACTION_add_new_credit_pro_transaction');
 	Route::get('ACTION_add_new_debit_pro_transaction', 'pros_SINGLE_Controller@ACTION_add_new_debit_pro_transaction')->name('pros_SINGLE-ACTION_add_new_debit_pro_transaction');
 	Route::get('ACTION_add_new_stag_app_pro_access', 'pros_SINGLE_Controller@ACTION_add_new_stag_app_pro_access')->name('pros_SINGLE-ACTION_add_new_stag_app_pro_access');