Browse Source

Support for custom API name in sub-entity add forms

Vijayakrishnan Krishnan 5 năm trước cách đây
mục cha
commit
6afc8fb987

+ 10 - 4
app/Console/Commands/GenerateTreeCommand.php

@@ -311,8 +311,13 @@ class GenController {
                     $newMethod->data[] = $method->data[$i];
                 }
                 $newMethod->parentSub = $this->name . '-' . $method->name;
-                $newMethod->table = explode(":", $method->data[1])[1];
+                $parts = explode(":", $method->data[1]);
+                $newMethod->table = $parts[1];
+                if(count($parts) === 3) {
+                    $newMethod->api = $parts[2];
+                }
                 $newMethod->exitURL = $method->exitURL;
+                $newMethod->showLink = false;
                 $newMethods[] = $newMethod;
                 $method->childAddRoute = $this->name . '-' . $methodName;
             }
@@ -461,7 +466,7 @@ class GenController {
         $subLinksView = resource_path("views/{$controller->root}/{$controller->parentControllerName}/subs.blade.php");
         $subLinks = [];
         foreach ($controller->methods as $meth) {
-            if (strpos($meth->name, "SUB_") !== 0) continue;
+            if (strpos($meth->name, "SUB_") !== 0 || $meth->showLink === false) continue;
             $display = $this->snakeToTitleCase(substr($meth->name, 4));
             $subLinks[] = ($meth->show ? "@if(\$record->{$meth->show}) " : "") .
                 "<a " .
@@ -486,7 +491,7 @@ class GenController {
         $actionLinksView = resource_path("views/{$controller->root}/{$controller->parentControllerName}/actions.blade.php");
         $actionLinks = [];
         foreach ($controller->methods as $meth) {
-            if (strpos($meth->name, "ACTION_") !== 0) continue;
+            if (strpos($meth->name, "ACTION_") !== 0 || $meth->showLink === false) continue;
             $display = $this->camelToTitleCase(substr($meth->name, 7));
             $actionLinks[] = ($meth->show ? "@if(\$record->{$meth->show}) " : "") .
                 "<a " .
@@ -522,7 +527,7 @@ class GenController {
             $text = str_replace("_API_", "/api/{$this->snakeToCamelCase($controller->dbTable)}/" . substr($method->name, 7), $text);
         }
         else {
-            $text = str_replace("_API_", "/api/{$this->snakeToCamelCase($method->table)}/create", $text);
+            $text = str_replace("_API_", "/api/{$this->snakeToCamelCase($method->table)}/{$method->api}", $text);
         }
 
         $text = str_replace("_RETURN_ROUTE_", "{$controller->name}-{$method->name}", $text);
@@ -749,6 +754,7 @@ class GenControllerMethod {
     public $show = null;
     public $viewURL = false;
     public $exitURL = false;
+    public $showLink = true;
     public function __construct($name, $route)
     {
         $this->name = $name;

+ 1 - 1
generatecv/tree.txt

@@ -224,7 +224,7 @@ PRO
             bills
                 id=bill.note_id
 # :: api is createForNote
-                add_new:bill
+                add_new:bill:createForNote
                     noteUid:hidden=uid
                     effectiveDate:date
                     code

+ 1 - 2
resources/views/admin/pros/actions.blade.php

@@ -12,5 +12,4 @@
 <a href='/pros/view/<?= $record->uid ?>/ACTION_updatePaymentProcessingDetail' class='d-block btn btn-sm btn-default mb-3'>Update Payment Processing Detail</a>
 <a href='/pros/view/<?= $record->uid ?>/ACTION_uploadDriverLicense' class='d-block btn btn-sm btn-default mb-3'>Upload Driver License</a>
 <a href='/pros/view/<?= $record->uid ?>/ACTION_updateDriverLicenseInfo' class='d-block btn btn-sm btn-default mb-3'>Update Driver License Info</a>
-<a href='/pros/view/<?= $record->uid ?>/ACTION_updateSsn' class='d-block btn btn-sm btn-default mb-3'>Update Ssn</a>
-<a href='/pros/view/<?= $record->uid ?>/ACTION_payment_scheduleAddNew' class='d-block btn btn-sm btn-default mb-3'>Payment_schedule Add New</a>
+<a href='/pros/view/<?= $record->uid ?>/ACTION_updateSsn' class='d-block btn btn-sm btn-default mb-3'>Update Ssn</a>

+ 1 - 3
resources/views/pro/care_months/actions.blade.php

@@ -16,6 +16,4 @@
 <a href='/care_months/view/<?= $record->uid ?>/ACTION_updateWhyIsRmCanceledThisMonth' class='d-block btn btn-sm btn-default mb-3'>Update Why Is Rm Canceled This Month</a>
 <a href='/care_months/view/<?= $record->uid ?>/ACTION_setIsRmCanceledThisMonthToFalse' class='d-block btn btn-sm btn-default mb-3'>Set Is Rm Canceled This Month To False</a>
 <a href='/care_months/view/<?= $record->uid ?>/ACTION_setIsTmThisMonthToTrue' class='d-block btn btn-sm btn-default mb-3'>Set Is Tm This Month To True</a>
-<a href='/care_months/view/<?= $record->uid ?>/ACTION_setIsTmThisMonthToFalse' class='d-block btn btn-sm btn-default mb-3'>Set Is Tm This Month To False</a>
-<a href='/care_months/view/<?= $record->uid ?>/ACTION_cm_time_entriesAddNew' class='d-block btn btn-sm btn-default mb-3'>Cm_time_entries Add New</a>
-<a href='/care_months/view/<?= $record->uid ?>/ACTION_rm_time_entriesAddNew' class='d-block btn btn-sm btn-default mb-3'>Rm_time_entries Add New</a>
+<a href='/care_months/view/<?= $record->uid ?>/ACTION_setIsTmThisMonthToFalse' class='d-block btn btn-sm btn-default mb-3'>Set Is Tm This Month To False</a>

+ 1 - 6
resources/views/pro/my_clients/actions.blade.php

@@ -33,9 +33,4 @@
 <a href='/my_clients/view/<?= $record->uid ?>/ACTION_deactivate' class='d-block btn btn-sm btn-default mb-3'>Deactivate</a>
 <a href='/my_clients/view/<?= $record->uid ?>/ACTION_updateDeactivationMemo' class='d-block btn btn-sm btn-default mb-3'>Update Deactivation Memo</a>
 <a href='/my_clients/view/<?= $record->uid ?>/ACTION_reactivate' class='d-block btn btn-sm btn-default mb-3'>Reactivate</a>
-<a href='/my_clients/view/<?= $record->uid ?>/ACTION_updateReactivationMemo' class='d-block btn btn-sm btn-default mb-3'>Update Reactivation Memo</a>
-<a href='/my_clients/view/<?= $record->uid ?>/ACTION_pro_accessAddNew' class='d-block btn btn-sm btn-default mb-3'>Pro_access Add New</a>
-<a href='/my_clients/view/<?= $record->uid ?>/ACTION_notesAddNew' class='d-block btn btn-sm btn-default mb-3'>Notes Add New</a>
-<a href='/my_clients/view/<?= $record->uid ?>/ACTION_care_monthsAddNew' class='d-block btn btn-sm btn-default mb-3'>Care_months Add New</a>
-<a href='/my_clients/view/<?= $record->uid ?>/ACTION_action_itemsAddNew' class='d-block btn btn-sm btn-default mb-3'>Action_items Add New</a>
-<a href='/my_clients/view/<?= $record->uid ?>/ACTION_erxAddNew' class='d-block btn btn-sm btn-default mb-3'>Erx Add New</a>
+<a href='/my_clients/view/<?= $record->uid ?>/ACTION_updateReactivationMemo' class='d-block btn btn-sm btn-default mb-3'>Update Reactivation Memo</a>

+ 1 - 2
resources/views/pro/my_teams/actions.blade.php

@@ -2,5 +2,4 @@
 <a href='/my_teams/view/<?= $record->uid ?>/ACTION_deactivate' class='d-block btn btn-sm btn-default mb-3'>Deactivate</a>
 <a href='/my_teams/view/<?= $record->uid ?>/ACTION_updateDeactivationMemo' class='d-block btn btn-sm btn-default mb-3'>Update Deactivation Memo</a>
 <a href='/my_teams/view/<?= $record->uid ?>/ACTION_reactivate' class='d-block btn btn-sm btn-default mb-3'>Reactivate</a>
-<a href='/my_teams/view/<?= $record->uid ?>/ACTION_updateReactivationMemo' class='d-block btn btn-sm btn-default mb-3'>Update Reactivation Memo</a>
-<a href='/my_teams/view/<?= $record->uid ?>/ACTION_clientsAddNew' class='d-block btn btn-sm btn-default mb-3'>Clients Add New</a>
+<a href='/my_teams/view/<?= $record->uid ?>/ACTION_updateReactivationMemo' class='d-block btn btn-sm btn-default mb-3'>Update Reactivation Memo</a>

+ 1 - 2
resources/views/pro/notes/actions.blade.php

@@ -1,2 +1 @@
-<a href='/notes/view/<?= $record->uid ?>/ACTION_signAsHcp' class='d-block btn btn-sm btn-default mb-3'>Sign As Hcp</a>
-<a href='/notes/view/<?= $record->uid ?>/ACTION_billsAddNew' class='d-block btn btn-sm btn-default mb-3'>Bills Add New</a>
+<a href='/notes/view/<?= $record->uid ?>/ACTION_signAsHcp' class='d-block btn btn-sm btn-default mb-3'>Sign As Hcp</a>

+ 1 - 1
resources/views/pro/notes_SINGLE/ACTION_billsAddNew.blade.php

@@ -15,7 +15,7 @@
         @endif
 
         <input type="hidden" name="_uid" value="{{ $record->uid }}">
-        <input type="hidden" name="_api" value="/api/bill/create">
+        <input type="hidden" name="_api" value="/api/bill/createForNote">
         <input type="hidden" name="_success" value="{{route('notes_SINGLE-SUB_bills', ['uid' => $record->uid])}}">
         <input type="hidden" name="_return" value="{{route('notes_SINGLE-ACTION_billsAddNew', ['uid' => $record->uid])}}">
         <input class='form-control' type='hidden' name='noteUid' value='{{ old('noteUid') ? old('noteUid') : $record->uid }}' >