Prechádzať zdrojové kódy

Support for multiple custom adders per entity

Vijayakrishnan Krishnan 5 rokov pred
rodič
commit
1ef98e4370

+ 17 - 18
app/Console/Commands/GenerateTreeCommand.php

@@ -99,6 +99,9 @@ class GenerateTreeCommand extends Command
                                     $currentSubController->sub = true;
                                     $newMethod->redirect = "/" . $line . "/SUB_dashboard";
                                 }
+                                else if(strpos($method, "add_new") === 0) {
+                                    $newMethod->type = 'add';
+                                }
                                 $currentMethod = $newMethod;
                             }
                         }
@@ -132,7 +135,7 @@ class GenerateTreeCommand extends Command
                         if($line === 'ACTIONS' || $line === 'SUB') {
                             $currentSubType = $line;
                         }
-                        else if (!empty($currentMethod) && $currentMethod->name === 'add_new') { // this is a field in add_new
+                        else if (!empty($currentMethod) && strpos($currentMethod->name, 'add_new') === 0) { // this is a field in add_new
                             $currentMethod->data[] = $line;
                         }
 
@@ -242,13 +245,7 @@ class GenController {
 
         // check if any method has a "sub add_new" in it, if yes, add action for the same
         $newMethods = [];
-//        echo "--------------------------------------\n";
-//        dump($this->name);
-//        echo "--------------------------------------\n";
         foreach ($this->methods as $method) {
-//            dump($method->name);
-//            dump($method->type);
-//            dump($method->data);
             if($method->type === 'sub' && count($method->data) > 1 && strpos($method->data[1], 'add_new') === 0) {
                 $methodName = preg_replace("/^SUB_/", "ACTION_", $method->name) . 'AddNew';
                 $methodRoute = str_replace("/SUB_", "/ACTION_", $method->route) . 'AddNew';
@@ -268,12 +265,6 @@ class GenController {
         }
         $this->methods = array_merge($this->methods, $newMethods);
 
-//        foreach ($this->methods as $method) {
-//            dump($method->name);
-//            dump($method->type);
-//            dump($method->data);
-//        }
-
         foreach ($this->methods as $method) {
             $code[] = "";
             $code[] = "\t// GET {$method->route}";
@@ -338,7 +329,7 @@ class GenController {
             else if($method->name === 'index') {
                 $this->saveIndexView($controller, $method);
             }
-            else if($method->name === 'add_new' && $controller->hasAdd) {
+            else if(strpos($method->name, 'add_new') === 0 && $controller->hasAdd) {
                 $this->saveAddNewView($controller, $method);
             }
         }
@@ -350,9 +341,16 @@ class GenController {
         $text = str_replace("_NAME_", $this->snakeToTitleCase($controller->name), $text);
 
         if($controller->hasAdd) {
-            $addLink = "<a class='btn btn-primary btn-sm' href='/{$controller->name}/add_new'>" .
-                "<i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>";
-            $text = str_replace("<!-- _ADD_NEW_LINK_ -->", $addLink, $text);
+            $addLinks = [];
+            foreach ($controller->methods as $m) {
+                if($m->type === 'add') {
+                    $addLinks[] = "<a class='btn btn-primary btn-sm ml-2' " .
+                        "href='/{$controller->name}/{$m->name}'>" .
+                        "<i class='fa fa-plus-circle' aria-hidden='true'></i> " .
+                        "{$this->snakeToTitleCase($m->name)}</a>";
+                }
+            }
+            $text = str_replace("<!-- _ADD_NEW_LINK_ -->", implode("\n", $addLinks), $text);
         }
 
         $columns = DB::getSchemaBuilder()->getColumnListing($controller->dbTable);
@@ -515,9 +513,10 @@ class GenController {
     {
         $text = file_get_contents(base_path('generatecv/tree-templates/add_new.template.blade.php'));
         $text = str_replace("_NAME_", $this->snakeToTitleCase($controller->name), $text);
+        $text = str_replace("_ADD_TITLE_", $this->snakeToTitleCase($method->name), $text);
         $text = str_replace("_API_", "/api/{$this->snakeToCamelCase($controller->dbTable)}/{$method->api}", $text);
         $text = str_replace("_BACK_ROUTE_", "{$controller->name}-index", $text);
-        $text = str_replace("_RETURN_ROUTE_", "{$controller->name}-add_new", $text);
+        $text = str_replace("_RETURN_ROUTE_", "{$controller->name}-{$method->name}", $text);
         $columns = $method->data;
         $fields = [];
         foreach ($columns as $column) {

+ 3 - 3
app/Http/Controllers/bills_Controller.php

@@ -15,10 +15,10 @@ class bills_Controller extends Controller
 		return view('pro/bills/index', compact('records'));
 	}
 
-	// GET /bills/add_new
-	public function add_new(Request $request) {
+	// GET /bills/add_new_for_note
+	public function add_new_for_note(Request $request) {
 		$records = DB::table('bill')->get();
-		return view('pro/bills/add_new', compact('records'));
+		return view('pro/bills/add_new_for_note', compact('records'));
 	}
 
 	// GET /bills/view/{uid}

+ 12 - 0
app/Http/Controllers/care_month_entries_Controller.php

@@ -15,6 +15,18 @@ class care_month_entries_Controller extends Controller
 		return view('pro/care_month_entries/index', compact('records'));
 	}
 
+	// GET /care_month_entries/add_new_for_cm
+	public function add_new_for_cm(Request $request) {
+		$records = DB::table('care_month_entry')->get();
+		return view('pro/care_month_entries/add_new_for_cm', compact('records'));
+	}
+
+	// GET /care_month_entries/add_new_for_rm
+	public function add_new_for_rm(Request $request) {
+		$records = DB::table('care_month_entry')->get();
+		return view('pro/care_month_entries/add_new_for_rm', compact('records'));
+	}
+
 	// GET /care_month_entries/view/{uid}
 	public function view(Request $request, $uid) {
 		return redirect("/care_month_entries/view/$uid/SUB_dashboard");

+ 1 - 1
generatecv/tree-templates/add_new.template.blade.php

@@ -2,7 +2,7 @@
 @section('content')
 
     <h3 class="d-flex mb-3">
-        <div>_NAME_: Add New</div>
+        <div>_NAME_: _ADD_TITLE_</div>
         <div class="ml-auto">
             <a class="btn btn-primary btn-sm" href="{{route('_BACK_ROUTE_')}}">
                 <i class="fa fa-chevron-left" aria-hidden="true"></i>

+ 32 - 12
generatecv/tree.txt

@@ -2,7 +2,7 @@ PRO
 #    dashboard
 #    my_payment_schedule
     my_teams|team|add|view
-    my_teams/add_new
+    my_teams/add_new:create
         hcpProUid:record:pro:uid,name_display
         allyProUid:record:pro:uid,name_display
         teamNumber
@@ -16,7 +16,7 @@ PRO
                 id=client.team_id
             audit_log
     my_clients|client|add|view
-    my_clients/add_new
+    my_clients/add_new:create
         teamUid:record:team:uid,team_number
         mcpProUid:record:pro:uid,name_display
         allyProUid:record:pro:uid,name_display
@@ -160,7 +160,7 @@ PRO
                     contentDetail
             care_months
                 id=care_month.client_id
-#           care_months/add_new
+#           care_months/add_new:create
             care_month_entries
                 id=care_month_entry.client_id
             bills
@@ -169,16 +169,16 @@ PRO
                 id=pro_transaction.client_id
             action_items
                 id=action_item.client_id
-#           action_items/add_new
+#           action_items/add_new:create
             erx
-#           erx/add_new
+#           erx/add_new:create
             mcp_updates
                 id=client_mcp_update.client_id
             ally_updates
                 id=client_ally_update.client_id
             audit_log
     notes|note|add|view
-    notes/add_new
+    notes/add_new:create
         clientUid:record:client:uid,name_display
         hcpProUid:record:pro:uid,name_display
         allyProUid:record:pro:uid,name_display
@@ -211,7 +211,7 @@ PRO
             dashboard
             audit_log
     care_months|care_month|add|view
-    care_months/add_new
+    care_months/add_new:create
         clientUid:record:client:uid,name_display
         startDate:date
     care_months/view/{uid}
@@ -224,7 +224,27 @@ PRO
             dashboard
             time_entries
             audit_log
-    care_month_entries|care_month_entry|view
+    care_month_entries|care_month_entry|add|view
+    care_month_entries/add_new_for_cm:createForCm
+        careMonthUid:record:care_month:uid,start_date
+        proUid:record:pro:uid,name_display
+        effectiveDate:date
+        timeInSeconds:number
+        isTimeSpecific
+        startingTime:time
+        endingTime:time
+        contentText
+        contentDetail
+    care_month_entries/add_new_for_rm:createForRm
+        careMonthUid:record:care_month:uid,start_date
+        proUid:record:pro:uid,name_display
+        effectiveDate:date
+        timeInSeconds:number
+        isTimeSpecific
+        startingTime:time
+        endingTime:time
+        contentText
+        contentDetail
     care_month_entries/view/{uid}
         ACTIONS
             updateContent
@@ -239,7 +259,7 @@ PRO
         SUB
             dashboard
     bills|bill|add|view
-    bills/add_new:createForNote
+    bills/add_new_for_note:createForNote
         noteUid:record:note:uid,uid
         effectiveDate:date
         code
@@ -275,7 +295,7 @@ PRO
 ADMIN
 #   admin_dashboard
     facilities|facility|view
-    facilities/add_new
+    facilities/add_new:create
     facilities/view/{uid}
         ACTIONS
         SUB
@@ -284,7 +304,7 @@ ADMIN
             action_items
             audit_log
     pros|pro|add|view
-    pros/add_new
+    pros/add_new:create
         cellNumber:tel
         emailAddress:email
         name.nameDisplay
@@ -383,7 +403,7 @@ ADMIN
             sessions
             audit_log
     pro_rates|pro_rate|add|view
-    pro_rates/add_new
+    pro_rates/add_new:create
         proUid:record:pro:uid,name_display
         asHcpOrAlly:select:HCP,ALLY
         code

+ 1 - 1
resources/views/admin/pro_rates/index.blade.php

@@ -4,7 +4,7 @@
     <h3 class="d-flex mb-3">
         <div>Pro Rates: List</div>
         <div class="ml-auto">
-            <a class='btn btn-primary btn-sm' href='/pro_rates/add_new'><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
+            <a class='btn btn-primary btn-sm ml-2' href='/pro_rates/add_new'><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
         </div>
     </h3>
 

+ 1 - 1
resources/views/admin/pros/index.blade.php

@@ -4,7 +4,7 @@
     <h3 class="d-flex mb-3">
         <div>Pros: List</div>
         <div class="ml-auto">
-            <a class='btn btn-primary btn-sm' href='/pros/add_new'><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
+            <a class='btn btn-primary btn-sm ml-2' href='/pros/add_new'><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
         </div>
     </h3>
 

+ 78 - 0
resources/views/pro/bills/add_new_for_note.blade.php

@@ -0,0 +1,78 @@
+@extends('layouts.pro-logged-in')
+@section('content')
+
+    <h3 class="d-flex mb-3">
+        <div>Bills: Add New For Note</div>
+        <div class="ml-auto">
+            <a class="btn btn-primary btn-sm" href="{{route('bills-index')}}">
+                <i class="fa fa-chevron-left" aria-hidden="true"></i>
+                Back
+            </a>
+        </div>
+    </h3>
+
+    <form action="/post-to-api"
+          method="post" enctype="multipart/form-data"
+          class="bg-light rounded border px-3 pt-3 mb-3">
+        @csrf
+
+        @if (session('message'))
+            <div class="alert alert-danger">{{ session('message') }}</div>
+        @endif
+
+        <input type="hidden" name="_api" value="/api/bill/createForNote">
+        <input type="hidden" name="_success" value="{{route('bills-index')}}">
+        <input type="hidden" name="_return" value="{{route('bills-add_new_for_note')}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Note Uid</label>
+<select class='form-control' name='noteUid' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('note')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option value='<?= $o->uid ?>'><?= $o->uid ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Effective Date</label>
+<input class='form-control' type='date' name='effectiveDate' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Code</label>
+<input class='form-control' type='text' name='code' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Reason 1</label>
+<input class='form-control' type='text' name='reason1' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Reason 2</label>
+<input class='form-control' type='text' name='reason2' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Reason 3</label>
+<input class='form-control' type='text' name='reason3' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Reason 3Plus</label>
+<input class='form-control' type='text' name='reason3Plus' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Service Location</label>
+<input class='form-control' type='text' name='serviceLocation' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Modifier</label>
+<input class='form-control' type='text' name='modifier' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Number Of Units</label>
+<input class='form-control' type='number' name='numberOfUnits' >
+</div>
+        <div class="form-group mb-3">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('bills-index')}}" class="btn btn-sm btn-default px-5">Cancel</a>
+        </div>
+    </form>
+
+@endsection

+ 1 - 1
resources/views/pro/bills/index.blade.php

@@ -4,7 +4,7 @@
     <h3 class="d-flex mb-3">
         <div>Bills: List</div>
         <div class="ml-auto">
-            <a class='btn btn-primary btn-sm' href='/bills/add_new'><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
+            <a class='btn btn-primary btn-sm ml-2' href='/bills/add_new_for_note'><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New For Note</a>
         </div>
     </h3>
 

+ 80 - 0
resources/views/pro/care_month_entries/add_new_for_cm.blade.php

@@ -0,0 +1,80 @@
+@extends('layouts.pro-logged-in')
+@section('content')
+
+    <h3 class="d-flex mb-3">
+        <div>Care Month Entries: Add New For Cm</div>
+        <div class="ml-auto">
+            <a class="btn btn-primary btn-sm" href="{{route('care_month_entries-index')}}">
+                <i class="fa fa-chevron-left" aria-hidden="true"></i>
+                Back
+            </a>
+        </div>
+    </h3>
+
+    <form action="/post-to-api"
+          method="post" enctype="multipart/form-data"
+          class="bg-light rounded border px-3 pt-3 mb-3">
+        @csrf
+
+        @if (session('message'))
+            <div class="alert alert-danger">{{ session('message') }}</div>
+        @endif
+
+        <input type="hidden" name="_api" value="/api/careMonthEntry/createForCm">
+        <input type="hidden" name="_success" value="{{route('care_month_entries-index')}}">
+        <input type="hidden" name="_return" value="{{route('care_month_entries-add_new_for_cm')}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Care Month Uid</label>
+<select class='form-control' name='careMonthUid' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('care_month')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option value='<?= $o->uid ?>'><?= $o->start_date ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Pro Uid</label>
+<select class='form-control' name='proUid' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Effective Date</label>
+<input class='form-control' type='date' name='effectiveDate' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Time In Seconds</label>
+<input class='form-control' type='number' name='timeInSeconds' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Is Time Specific</label>
+<input class='form-control' type='text' name='isTimeSpecific' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Starting Time</label>
+<input class='form-control' type='time' name='startingTime' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Ending Time</label>
+<input class='form-control' type='time' name='endingTime' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Content Text</label>
+<input class='form-control' type='text' name='contentText' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Content Detail</label>
+<input class='form-control' type='text' name='contentDetail' >
+</div>
+        <div class="form-group mb-3">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('care_month_entries-index')}}" class="btn btn-sm btn-default px-5">Cancel</a>
+        </div>
+    </form>
+
+@endsection

+ 80 - 0
resources/views/pro/care_month_entries/add_new_for_rm.blade.php

@@ -0,0 +1,80 @@
+@extends('layouts.pro-logged-in')
+@section('content')
+
+    <h3 class="d-flex mb-3">
+        <div>Care Month Entries: Add New For Rm</div>
+        <div class="ml-auto">
+            <a class="btn btn-primary btn-sm" href="{{route('care_month_entries-index')}}">
+                <i class="fa fa-chevron-left" aria-hidden="true"></i>
+                Back
+            </a>
+        </div>
+    </h3>
+
+    <form action="/post-to-api"
+          method="post" enctype="multipart/form-data"
+          class="bg-light rounded border px-3 pt-3 mb-3">
+        @csrf
+
+        @if (session('message'))
+            <div class="alert alert-danger">{{ session('message') }}</div>
+        @endif
+
+        <input type="hidden" name="_api" value="/api/careMonthEntry/createForRm">
+        <input type="hidden" name="_success" value="{{route('care_month_entries-index')}}">
+        <input type="hidden" name="_return" value="{{route('care_month_entries-add_new_for_rm')}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Care Month Uid</label>
+<select class='form-control' name='careMonthUid' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('care_month')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option value='<?= $o->uid ?>'><?= $o->start_date ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Pro Uid</label>
+<select class='form-control' name='proUid' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Effective Date</label>
+<input class='form-control' type='date' name='effectiveDate' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Time In Seconds</label>
+<input class='form-control' type='number' name='timeInSeconds' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Is Time Specific</label>
+<input class='form-control' type='text' name='isTimeSpecific' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Starting Time</label>
+<input class='form-control' type='time' name='startingTime' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Ending Time</label>
+<input class='form-control' type='time' name='endingTime' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Content Text</label>
+<input class='form-control' type='text' name='contentText' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Content Detail</label>
+<input class='form-control' type='text' name='contentDetail' >
+</div>
+        <div class="form-group mb-3">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('care_month_entries-index')}}" class="btn btn-sm btn-default px-5">Cancel</a>
+        </div>
+    </form>
+
+@endsection

+ 2 - 1
resources/views/pro/care_month_entries/index.blade.php

@@ -4,7 +4,8 @@
     <h3 class="d-flex mb-3">
         <div>Care Month Entries: List</div>
         <div class="ml-auto">
-            <!-- _ADD_NEW_LINK_ -->
+            <a class='btn btn-primary btn-sm ml-2' href='/care_month_entries/add_new_for_cm'><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New For Cm</a>
+<a class='btn btn-primary btn-sm ml-2' href='/care_month_entries/add_new_for_rm'><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New For Rm</a>
         </div>
     </h3>
 

+ 1 - 1
resources/views/pro/care_months/index.blade.php

@@ -4,7 +4,7 @@
     <h3 class="d-flex mb-3">
         <div>Care Months: List</div>
         <div class="ml-auto">
-            <a class='btn btn-primary btn-sm' href='/care_months/add_new'><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
+            <a class='btn btn-primary btn-sm ml-2' href='/care_months/add_new'><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
         </div>
     </h3>
 

+ 1 - 1
resources/views/pro/my_clients/index.blade.php

@@ -4,7 +4,7 @@
     <h3 class="d-flex mb-3">
         <div>My Clients: List</div>
         <div class="ml-auto">
-            <a class='btn btn-primary btn-sm' href='/my_clients/add_new'><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
+            <a class='btn btn-primary btn-sm ml-2' href='/my_clients/add_new'><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
         </div>
     </h3>
 

+ 1 - 1
resources/views/pro/my_teams/index.blade.php

@@ -4,7 +4,7 @@
     <h3 class="d-flex mb-3">
         <div>My Teams: List</div>
         <div class="ml-auto">
-            <a class='btn btn-primary btn-sm' href='/my_teams/add_new'><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
+            <a class='btn btn-primary btn-sm ml-2' href='/my_teams/add_new'><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
         </div>
     </h3>
 

+ 1 - 1
resources/views/pro/notes/index.blade.php

@@ -4,7 +4,7 @@
     <h3 class="d-flex mb-3">
         <div>Notes: List</div>
         <div class="ml-auto">
-            <a class='btn btn-primary btn-sm' href='/notes/add_new'><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
+            <a class='btn btn-primary btn-sm ml-2' href='/notes/add_new'><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
         </div>
     </h3>
 

+ 3 - 1
routes/generated.php

@@ -105,6 +105,8 @@ Route::get('/care_months/view/{uid}/SUB_audit_log', 'care_months_SINGLE_Controll
 
 // --- pro: care_month_entries --- //
 Route::get('/care_month_entries', 'care_month_entries_Controller@index')->name('care_month_entries-index');
+Route::get('/care_month_entries/add_new_for_cm', 'care_month_entries_Controller@add_new_for_cm')->name('care_month_entries-add_new_for_cm');
+Route::get('/care_month_entries/add_new_for_rm', 'care_month_entries_Controller@add_new_for_rm')->name('care_month_entries-add_new_for_rm');
 Route::get('/care_month_entries/view/{uid}', 'care_month_entries_Controller@view')->name('care_month_entries-view');
 
 // --- pro: care_month_entries_SINGLE --- //
@@ -114,7 +116,7 @@ Route::get('/care_month_entries/view/{uid}/SUB_dashboard', 'care_month_entries_S
 
 // --- pro: bills --- //
 Route::get('/bills', 'bills_Controller@index')->name('bills-index');
-Route::get('/bills/add_new', 'bills_Controller@add_new')->name('bills-add_new');
+Route::get('/bills/add_new_for_note', 'bills_Controller@add_new_for_note')->name('bills-add_new_for_note');
 Route::get('/bills/view/{uid}', 'bills_Controller@view')->name('bills-view');
 
 // --- pro: bills_SINGLE --- //