Selaa lähdekoodia

fixed section sorting

Josh 4 vuotta sitten
vanhempi
commit
2c0be569c5

+ 20 - 0
app/Http/Controllers/pros_SINGLE_Controller.php

@@ -281,6 +281,26 @@ class pros_SINGLE_Controller extends Controller
 		return response()->view('admin/pros_SINGLE/ACTION_setCanCreateClientWithInvalidMcnToFalse', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
+	// GET /pros/view/{uid}/ACTION_setCanAccessRmPortalToTrue
+	public function ACTION_setCanAccessRmPortalToTrue(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_setCanAccessRmPortalToTrue');
+		}
+		return response()->view('admin/pros_SINGLE/ACTION_setCanAccessRmPortalToTrue', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /pros/view/{uid}/ACTION_setCanAccessRmPortalToFalse
+	public function ACTION_setCanAccessRmPortalToFalse(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_setCanAccessRmPortalToFalse');
+		}
+		return response()->view('admin/pros_SINGLE/ACTION_setCanAccessRmPortalToFalse', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
 	// GET /pros/view/{uid}/ACTION_setIsVideoVisitAssistantToTrue
 	public function ACTION_setIsVideoVisitAssistantToTrue(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();

+ 5 - 0
generatecv/tree.txt

@@ -1000,6 +1000,8 @@ ADMIN
             setHasAccessToNextPatientButtonToFalse
             setCanCreateClientWithInvalidMcnToTrue
             setCanCreateClientWithInvalidMcnToFalse
+            setCanAccessRmPortalToTrue
+            setCanAccessRmPortalToFalse
             setIsVideoVisitAssistantToTrue
             setIsVideoVisitAssistantToFalse
             removeProfilePicture
@@ -1027,6 +1029,7 @@ ADMIN
                 !grp:MCP Enrollment:is_enrolled_as_mcp
                 !grp:Next Patient Button:has_access_to_next_patient_button
                 !grp:Create Client With Invalid MCN:can_create_client_with_invalid_mcn
+                !grp:Access RM Portal:can_access_rm_portal
                 !grp:Profile Picture:profile_picture_base64:Update Profile Picture:circle=>/pros/view/$uid/ACTION_putProfilePicture
                 !grp:Address:mailing_address_line1,mailing_address_line2,mailing_address_city,mailing_address_state,mailing_address_country,mailing_address_zip,mailing_address_lat,mailing_address_long,home_address_line1,home_address_line2,home_address_city,home_address_state,home_address_country,home_address_zip,home_address_lat,home_address_long:Update Address:circle=>/pros/view/$uid/ACTION_updateAddress
                 !grp:Payment Processing:is_payment_processing_detail_complete,payment_processing_detail
@@ -1055,6 +1058,8 @@ ADMIN
                 !act:has_access_to_next_patient_button:setHasAccessToNextPatientButtonToTrue:circle:if-not:has_access_to_next_patient_button=>/pros/view/$uid/ACTION_setHasAccessToNextPatientButtonToTrue
                 !act:can_create_client_with_invalid_mcn:setCanCreateClientWithInvalidMcnToFalse:circle:if:can_create_client_with_invalid_mcn=>/pros/view/$uid/ACTION_setCanCreateClientWithInvalidMcnToFalse
                 !act:can_create_client_with_invalid_mcn:setCanCreateClientWithInvalidMcnToTrue:circle:if-not:can_create_client_with_invalid_mcn=>/pros/view/$uid/ACTION_setCanCreateClientWithInvalidMcnToTrue
+                !act:can_access_rm_portal:setCanAccessRmPortalToTrue:circle:if-not:can_access_rm_portal=>/pros/view/$uid/ACTION_setCanAccessRmPortalToTrue
+                !act:can_access_rm_portal:setCanAccessRmPortalToFalse:circle:if:can_access_rm_portal=>/pros/view/$uid/ACTION_setCanAccessRmPortalToFalse
                 !act:profile_picture_base64:removeProfilePicture:circle=>/pros/view/$uid/ACTION_removeProfilePicture
                 !nal:
             pro_rates

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 3 - 0
public/jquery-ui/jquery-ui.min.css


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 5 - 0
public/jquery-ui/jquery-ui.min.js


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

@@ -25,6 +25,8 @@
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_setHasAccessToNextPatientButtonToFalse?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Set Has Access To Next Patient Button To False</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_setCanCreateClientWithInvalidMcnToTrue?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Set Can Create Client With Invalid Mcn To True</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_setCanCreateClientWithInvalidMcnToFalse?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Set Can Create Client With Invalid Mcn To False</a>
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_setCanAccessRmPortalToTrue?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Set Can Access Rm Portal To True</a>
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_setCanAccessRmPortalToFalse?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Set Can Access Rm Portal To False</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_setIsVideoVisitAssistantToTrue?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Set Is Video Visit Assistant To True</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_setIsVideoVisitAssistantToFalse?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Set Is Video Visit Assistant To False</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_removeProfilePicture?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Remove Profile Picture</a>

+ 38 - 0
resources/views/admin/pros_SINGLE/ACTION_setCanAccessRmPortalToFalse.blade.php

@@ -0,0 +1,38 @@
+@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>Set Can Access Rm Portal To False</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/pro/setCanAccessRmPortalToFalse">
+        <input type="hidden" name="_success" value="{{route('pros-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('pros_SINGLE-ACTION_setCanAccessRmPortalToFalse', ['uid' => $record->uid])}}">
+        
+        <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-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 38 - 0
resources/views/admin/pros_SINGLE/ACTION_setCanAccessRmPortalToTrue.blade.php

@@ -0,0 +1,38 @@
+@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>Set Can Access Rm Portal To True</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/pro/setCanAccessRmPortalToTrue">
+        <input type="hidden" name="_success" value="{{route('pros-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('pros_SINGLE-ACTION_setCanAccessRmPortalToTrue', ['uid' => $record->uid])}}">
+        
+        <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-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 16 - 0
resources/views/admin/pros_SINGLE/SUB_dashboard.blade.php

@@ -186,6 +186,22 @@
     </table>
 </div>
 
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">Access RM Portal
+                <span class="ml-auto"><!-- __GROUP_ACTION__ --></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Can Access Rm Portal</td><td class="w-75 px-2 font-weight-bold"><?= $record->can_access_rm_portal ?>@if(! $record->can_access_rm_portal) <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_setCanAccessRmPortalToTrue?optimised=1' title='setCanAccessRmPortalToTrue' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Set Can Access Rm Portal To True</span></a> @endif
+@if( $record->can_access_rm_portal) <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_setCanAccessRmPortalToFalse?optimised=1' title='setCanAccessRmPortalToFalse' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Set Can Access Rm Portal To False</span></a> @endif</td></tr>
+        </tbody>
+    </table>
+</div>
+
 <div class="table-responsive p-0 bg-white table-sm mb-3">
     <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
         <thead>

+ 28 - 26
resources/views/admin/section_templates/index.blade.php

@@ -1,34 +1,36 @@
+<?php /* DO NOT GENERATE */ ?>
 @extends('layouts.pro-logged-in')
 @section('content')
 
-    <h3 class="d-flex my-3 px-3 stag-heading stag-heading-index">
-        <div>Section Templates: List</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='/section_templates/add_new?optimised=1'><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
-        </div>
-    </h3>
+<h3 class="d-flex my-3 px-3 stag-heading stag-heading-index">
+    <div>Section Templates: List</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='/section_templates/add_new?optimised=1'><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
+    </div>
+</h3>
 
-    <div class="table-responsive p-0 bg-white border stag-table stag-table-index">
-        <table class="table table-hover text-nowrap table-striped">
-            <thead>
+<div class="table-responsive p-0 bg-white border stag-table stag-table-index">
+    <table class="table table-hover text-nowrap table-striped">
+        <thead>
             <tr>
-<th>&nbsp;</th>
-<th>Title</th>
-<th>Internal Name</th>
-<th>Position Index</th>
+                <th>&nbsp;</th>
+                <th>Title</th>
+                <th>Internal Name</th>
+                <th>Position Index</th>
+                <th></th>
             </tr>
-            </thead>
-            <tbody>
+        </thead>
+        <tbody id="sortable-section-templates">
             @foreach($records as $record)
-                <tr>
-<td><a href="/section_templates/view/<?= $record->uid ?>"><i class="fas fa-share-square"></i></a></td>
-<td><a href="/section_templates/view/<?= $record->uid ?>"><?= $record->title ?></a></td>
-<td><?= $record->internal_name ?></td>
-<td><?= $record->position_index ?></td>
-                </tr>
+            <tr data-internal-name="{{$record->internal_name}}">
+                <td><a href="/section_templates/view/<?= $record->uid ?>"><i class="fas fa-share-square"></i></a></td>
+                <td><a href="/section_templates/view/<?= $record->uid ?>"><?= $record->title ?></a></td>
+                <td><?= $record->internal_name ?></td>
+                <td><?= $record->position_index ?></td>
+                <td><a href=""><i class="fa fa-bars"></i></a></td>
+            </tr>
             @endforeach
-            </tbody>
-        </table>
-    </div>
-
-@endsection
+        </tbody>
+    </table>
+</div>
+@endsection

+ 275 - 217
resources/views/layouts/pro-logged-in.blade.php

@@ -1,6 +1,7 @@
 @if(!isset($_REQUEST['optimised']))
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -14,36 +15,56 @@
     <!-- overlayScrollbars -->
     <link rel="stylesheet" href="/AdminLTE-3.0.5/plugins/overlayScrollbars/css/OverlayScrollbars.min.css">
 
+    <link rel="stylesheet" href="{{asset('jquery-ui/jquery-ui.min.css')}}">
+
+
     <link href=/css/z.css rel=stylesheet>
 
     <style>
         .loading-rotate {
-            -webkit-animation:spin 0.3s linear infinite;
-            -moz-animation:spin 0.3s linear infinite;
-            animation:spin 0.3s linear infinite;
+            -webkit-animation: spin 0.3s linear infinite;
+            -moz-animation: spin 0.3s linear infinite;
+            animation: spin 0.3s linear infinite;
+        }
+
+        @-moz-keyframes spin {
+            100% {
+                -moz-transform: rotate(360deg);
+            }
+        }
+
+        @-webkit-keyframes spin {
+            100% {
+                -webkit-transform: rotate(360deg);
+            }
+        }
+
+        @keyframes spin {
+            100% {
+                -webkit-transform: rotate(360deg);
+                transform: rotate(360deg);
+            }
         }
-        @-moz-keyframes spin { 100% { -moz-transform: rotate(360deg); } }
-        @-webkit-keyframes spin { 100% { -webkit-transform: rotate(360deg); } }
-        @keyframes spin { 100% { -webkit-transform: rotate(360deg); transform:rotate(360deg); } }
     </style>
 
     {{-- stag theme --}}
     <link rel="stylesheet" href="/css/theme.css">
 </head>
+
 <body class="hold-transition sidebar-mini layout-fixed">
-<div class="wrapper">
+    <div class="wrapper">
 
-    <!-- Navbar -->
-    <nav class="main-header navbar navbar-expand navbar-white navbar-light">
-        <!-- Left navbar links -->
-        <ul class="navbar-nav">
-            <li class="nav-item">
-                <a class="nav-link" data-widget="pushmenu" href="#" role="button"><i class="fas fa-bars"></i></a>
-            </li>
-        </ul>
+        <!-- Navbar -->
+        <nav class="main-header navbar navbar-expand navbar-white navbar-light">
+            <!-- Left navbar links -->
+            <ul class="navbar-nav">
+                <li class="nav-item">
+                    <a class="nav-link" data-widget="pushmenu" href="#" role="button"><i class="fas fa-bars"></i></a>
+                </li>
+            </ul>
 
-        <!-- Right navbar links -->
-        {{--<ul class="navbar-nav ml-auto ml-2">
+            <!-- Right navbar links -->
+            {{--<ul class="navbar-nav ml-auto ml-2">
             <li class="nav-item">
                 <a id="reload-icon" class="nav-link" href="#" role="button" onclick="window.location.reload(); return false">
                     <i class="fa fa-sync"></i>
@@ -51,237 +72,274 @@
             </li>
         </ul>--}}
 
-        <ul class="navbar-nav ml-auto ml-2">
-            <li class="nav-item">
-                <a class="nav-link small d-flex align-items-center" href="#" title="Cell# {{$pro->cell_number}}">
-                    Hello {{$pro->name_first}}!
-                </a>
-            </li>
+            <ul class="navbar-nav ml-auto ml-2">
+                <li class="nav-item">
+                    <a class="nav-link small d-flex align-items-center" href="#" title="Cell# {{$pro->cell_number}}">
+                        Hello {{$pro->name_first}}!
+                    </a>
+                </li>
 
-            <li class="nav-item">
-                <a class="nav-link small d-flex align-items-center" href="{{env('HCP_PORTAL_URL', 'https://pro.securecpu.com')}}/pro_log_in_with_session_key/{{$performer->session_key}}" title="">
-                    Go to HCP portal
-                </a>
-            </li>
-        </ul>
-
-        <!-- SEARCH FORM -->
-        <form class="form-inline ml-2 w-25 stag-search-form">
-            <div class="input-group input-group-sm w-100">
-                <input class="form-control form-control-navbar" type="search" placeholder="Search" aria-label="Search">
-                <div class="input-group-append">
-                    <button class="btn btn-navbar" type="submit">
-                        <i class="fas fa-search"></i>
-                    </button>
+                <li class="nav-item">
+                    <a class="nav-link small d-flex align-items-center" href="{{env('HCP_PORTAL_URL', 'https://pro.securecpu.com')}}/pro_log_in_with_session_key/{{$performer->session_key}}" title="">
+                        Go to HCP portal
+                    </a>
+                </li>
+            </ul>
+
+            <!-- SEARCH FORM -->
+            <form class="form-inline ml-2 w-25 stag-search-form">
+                <div class="input-group input-group-sm w-100">
+                    <input class="form-control form-control-navbar" type="search" placeholder="Search" aria-label="Search">
+                    <div class="input-group-append">
+                        <button class="btn btn-navbar" type="submit">
+                            <i class="fas fa-search"></i>
+                        </button>
+                    </div>
                 </div>
+            </form>
+
+            <ul class="navbar-nav ml-2 ml-2">
+                <li class="nav-item">
+                    <a class="nav-link px-2" href="/api/session/logOut" target="_top" role="button" logout>
+                        <i class="fas fa-sign-out-alt"></i>
+                    </a>
+                </li>
+            </ul>
+        </nav>
+        <!-- /.navbar -->
+
+        @endif
+
+        <!-- Main Sidebar Container -->
+        <aside class="main-sidebar sidebar-light-primary elevation-4">
+            <!-- Brand Logo -->
+            <a href="#" class="brand-link">
+                <img src="/AdminLTE-3.0.5/dist/img/AdminLTELogo.png" alt="AdminLTE Logo" class="brand-image img-circle elevation-3" style="opacity: .8">
+                <span class="brand-text font-weight-light">Scholar</span>
+            </a>
+
+            <!-- Sidebar -->
+            <div class="sidebar">
+
+                <!-- Sidebar Menu -->
+                <nav class="mt-2">
+                    <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="false" id="main-sidenav">
+                        <li class="nav-item">
+                            <a href="/dashboard" class="nav-link {{ request()->route()->getActionName() === 'App\Http\Controllers\ProController@dashboard' ? 'active' : '' }}">
+                                <i class="nav-icon fa fa-palette"></i>
+                                <p>
+                                    Dashboard
+                                </p>
+                            </a>
+                            @if(\Illuminate\Support\Facades\View::exists('layouts.generated-links'))
+                            @include('layouts.generated-links')
+                            @endif
+                    </ul>
+                </nav>
+                <!-- /.sidebar-menu -->
             </div>
-        </form>
+            <!-- /.sidebar -->
+        </aside>
 
-        <ul class="navbar-nav ml-2 ml-2">
-            <li class="nav-item">
-                <a class="nav-link px-2" href="/api/session/logOut" target="_top" role="button" logout>
-                    <i class="fas fa-sign-out-alt"></i>
-                </a>
-            </li>
-        </ul>
-    </nav>
-    <!-- /.navbar -->
-
-@endif
-
-    <!-- Main Sidebar Container -->
-    <aside class="main-sidebar sidebar-light-primary elevation-4">
-        <!-- Brand Logo -->
-        <a href="#" class="brand-link">
-            <img src="/AdminLTE-3.0.5/dist/img/AdminLTELogo.png" alt="AdminLTE Logo" class="brand-image img-circle elevation-3"
-                 style="opacity: .8">
-            <span class="brand-text font-weight-light">Scholar</span>
-        </a>
-
-        <!-- Sidebar -->
-        <div class="sidebar">
-
-            <!-- Sidebar Menu -->
-            <nav class="mt-2">
-                <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="false" id="main-sidenav">
-                    <li class="nav-item">
-                        <a href="/dashboard" class="nav-link {{ request()->route()->getActionName() === 'App\Http\Controllers\ProController@dashboard' ? 'active' : '' }}">
-                            <i class="nav-icon fa fa-palette"></i>
-                            <p>
-                                Dashboard
-                            </p>
-                        </a>
-                    @if(\Illuminate\Support\Facades\View::exists('layouts.generated-links'))
-                        @include('layouts.generated-links')
-                    @endif
-                </ul>
-            </nav>
-            <!-- /.sidebar-menu -->
+        @if(!isset($_REQUEST['optimised']))
+        <!-- Content Wrapper. Contains page content -->
+        <div class="content-wrapper">
+            <!-- Main content -->
+            <section class="content p-0">
+                <div class="container-fluid p-0">
+                    <div class="row mb-2 mx-0">
+                        @endif
+                        <div class="col-12 px-0" id="main-content">
+                            @yield('content')
+                        </div>
+                        @if(!isset($_REQUEST['optimised']))
+                    </div>
+                </div><!-- /.container-fluid -->
+            </section>
+            <!-- /.content -->
         </div>
-        <!-- /.sidebar -->
-    </aside>
 
-@if(!isset($_REQUEST['optimised']))
-    <!-- Content Wrapper. Contains page content -->
-    <div class="content-wrapper">
-        <!-- Main content -->
-        <section class="content p-0">
-            <div class="container-fluid p-0">
-                <div class="row mb-2 mx-0">
-                    @endif
-                    <div class="col-12 px-0" id="main-content">
-                        @yield('content')
-                    </div>
-                    @if(!isset($_REQUEST['optimised']))
-                </div>
-            </div><!-- /.container-fluid -->
-        </section>
-        <!-- /.content -->
     </div>
+    <!-- ./wrapper -->
 
-</div>
-<!-- ./wrapper -->
+    <!-- Google Font: Source Sans Pro -->
+    <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet">
 
-<!-- Google Font: Source Sans Pro -->
-<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet">
+    <!-- jQuery -->
+    <script src="/AdminLTE-3.0.5/plugins/jquery/jquery.min.js"></script>
+    <!-- overlayScrollbars -->
+    <script src="/AdminLTE-3.0.5/plugins/overlayScrollbars/js/jquery.overlayScrollbars.min.js"></script>
+    <!-- AdminLTE App -->
+    <script src="/AdminLTE-3.0.5/dist/js/adminlte.js"></script>
 
-<!-- jQuery -->
-<script src="/AdminLTE-3.0.5/plugins/jquery/jquery.min.js"></script>
-<!-- overlayScrollbars -->
-<script src="/AdminLTE-3.0.5/plugins/overlayScrollbars/js/jquery.overlayScrollbars.min.js"></script>
-<!-- AdminLTE App -->
-<script src="/AdminLTE-3.0.5/dist/js/adminlte.js"></script>
+    <!-- unpoly -->
+    <script src="/unpoly-0.62.0/es6-promise.min.js"></script>
+    <script src="/unpoly-0.62.0/es6-promise.auto.min.js"></script>
+    <script src="/unpoly-0.62.0/unpoly.min.js"></script>
+    <link rel="stylesheet" href="/unpoly-0.62.0/unpoly.min.css">
+    <script src="{{asset('jquery-ui/jquery-ui.min.js')}}"></script>
 
-<!-- unpoly -->
-<script src="/unpoly-0.62.0/es6-promise.min.js"></script>
-<script src="/unpoly-0.62.0/es6-promise.auto.min.js"></script>
-<script src="/unpoly-0.62.0/unpoly.min.js"></script>
-<link rel="stylesheet" href="/unpoly-0.62.0/unpoly.min.css">
+    <style>
+        .up-modal-content {
+            padding: 0;
+        }
 
-<style>
-    .up-modal-content {
-        padding: 0;
-    }
-    .up-modal-close {
-        display: none;
-    }
-    .up-modal-dialog {
-        border-radius: 8px;
-        overflow: hidden;
-    }
-    .inner-side-nav {
-        width: 200px;
-    }
-    .inner-content {
-        width: calc(100% - 200px);
-    }
-</style>
+        .up-modal-close {
+            display: none;
+        }
 
-{{--<script>
+        .up-modal-dialog {
+            border-radius: 8px;
+            overflow: hidden;
+        }
+
+        .inner-side-nav {
+            width: 200px;
+        }
+
+        .inner-content {
+            width: calc(100% - 200px);
+        }
+    </style>
+
+    {{--<script>
     if(window === window.top) {
         window.location.href = '/mc' + window.location.pathname;
     }
 </script>--}}
 
-<script>
-    $(document).ready(function () {
+    <script>
+        $(document).ready(function() {
 
-        /*let stagCache = {}, stagCacheDone = {};
-        function clearStagCache() {
-            stagCache = {};
-        }
-        function preloadIntoStagCache(_target, _done) {
-            if(!!stagCache[_target] && stagCache[_target] !== 'loading') {
-                if(_done) _done(_data);
-                else if(stagCacheDone[_target]) {
-                    stagCacheDone[_target](_done);
-                    stagCacheDone[_target] = false;
-                }
-                console.log('Not pre-loading. Already in cache!');
-                return;
+            /*let stagCache = {}, stagCacheDone = {};
+            function clearStagCache() {
+                stagCache = {};
             }
-            stagCache[_target] = 'loading';
-            $.get('/' + _target + '?optimised=1', function(_data) {
-                stagCache[_target] = _data;
-                if(_done) _done(_data);
-                else if(stagCacheDone[_target]) {
-                    stagCacheDone[_target](_data);
-                    stagCacheDone[_target] = false;
+            function preloadIntoStagCache(_target, _done) {
+                if(!!stagCache[_target] && stagCache[_target] !== 'loading') {
+                    if(_done) _done(_data);
+                    else if(stagCacheDone[_target]) {
+                        stagCacheDone[_target](_done);
+                        stagCacheDone[_target] = false;
+                    }
+                    console.log('Not pre-loading. Already in cache!');
+                    return;
                 }
-            });
-        }
-        function getFromStagCache(_target, _done) {
-            if(!stagCache[_target]) { // unlikely to be hit if using mouse clicks
-                preloadIntoStagCache(_target, _done);
+                stagCache[_target] = 'loading';
+                $.get('/' + _target + '?optimised=1', function(_data) {
+                    stagCache[_target] = _data;
+                    if(_done) _done(_data);
+                    else if(stagCacheDone[_target]) {
+                        stagCacheDone[_target](_data);
+                        stagCacheDone[_target] = false;
+                    }
+                });
             }
-            else if(stagCache[_target] === 'loading') {
-                stagCacheDone[_target] = _done;
+            function getFromStagCache(_target, _done) {
+                if(!stagCache[_target]) { // unlikely to be hit if using mouse clicks
+                    preloadIntoStagCache(_target, _done);
+                }
+                else if(stagCache[_target] === 'loading') {
+                    stagCacheDone[_target] = _done;
+                }
+                else {
+                    _done(stagCache[_target]);
+                }
             }
-            else {
-                _done(stagCache[_target]);
+            function gotoTarget(target, pushState) {
+                getFromStagCache(target, function(_data) {
+                    $('#reload-icon').removeClass('loading-rotate');
+                    if(pushState) {
+                        window.top.history.pushState(target, null, '/mc/' + target);
+                    }
+                    var received = $('<div>' + _data + '</div>');
+                    $('#main-content').replaceWith(received.find('#main-content'));
+                    var activeHref = received.find('#main-sidenav').find('.nav-link.active').attr('href');
+                    $('#main-sidenav a.nav-link.active').removeClass('active').blur();
+                    $('#main-sidenav a[href="' + activeHref + '"]').addClass('active');
+                    $(window).scrollTop(0);
+                    window.setTimeout(function() {
+                        clearStagCache();
+                    }, 250);
+                });
             }
-        }
-        function gotoTarget(target, pushState) {
-            getFromStagCache(target, function(_data) {
-                $('#reload-icon').removeClass('loading-rotate');
-                if(pushState) {
-                    window.top.history.pushState(target, null, '/mc/' + target);
+            $(document).on('mouseenter', 'a:not([href="#"]):not([up-modal]):not([up-close]):not([no-ajax]):not([logout])', function() {
+                var target = this.href;
+                if(target.indexOf('//') !== -1) {
+                    target = target.split('//')[1];
+                    if(target.indexOf('/') !== -1) {
+                        target = target.substr(target.indexOf('/') + 1);
+                    }
                 }
-                var received = $('<div>' + _data + '</div>');
-                $('#main-content').replaceWith(received.find('#main-content'));
-                var activeHref = received.find('#main-sidenav').find('.nav-link.active').attr('href');
-                $('#main-sidenav a.nav-link.active').removeClass('active').blur();
-                $('#main-sidenav a[href="' + activeHref + '"]').addClass('active');
-                $(window).scrollTop(0);
-                window.setTimeout(function() {
-                    clearStagCache();
-                }, 250);
+                preloadIntoStagCache(target);
             });
-        }
-        $(document).on('mouseenter', 'a:not([href="#"]):not([up-modal]):not([up-close]):not([no-ajax]):not([logout])', function() {
-            var target = this.href;
-            if(target.indexOf('//') !== -1) {
-                target = target.split('//')[1];
-                if(target.indexOf('/') !== -1) {
-                    target = target.substr(target.indexOf('/') + 1);
+            $(document).on('click', 'a:not([href="#"]):not([up-modal]):not([up-close]):not([no-ajax]):not([logout])', function() {
+                $('#reload-icon').addClass('loading-rotate');
+                var target = this.href;
+                if(target.indexOf('//') !== -1) {
+                    target = target.split('//')[1];
+                    if(target.indexOf('/') !== -1) {
+                        target = target.substr(target.indexOf('/') + 1);
+                    }
                 }
-            }
-            preloadIntoStagCache(target);
-        });
-        $(document).on('click', 'a:not([href="#"]):not([up-modal]):not([up-close]):not([no-ajax]):not([logout])', function() {
-            $('#reload-icon').addClass('loading-rotate');
-            var target = this.href;
-            if(target.indexOf('//') !== -1) {
-                target = target.split('//')[1];
-                if(target.indexOf('/') !== -1) {
-                    target = target.substr(target.indexOf('/') + 1);
+                gotoTarget(target, true);
+                return false;
+            });
+            $(document).on('submit', 'form[action="/post-to-api"]:not(.custom-submit)', function() {
+                $('#reload-icon').addClass('loading-rotate');
+                $.post(this.action, $(this).serialize(), function(_data) {
+                    $('#main-content').replaceWith($(_data).find('#main-content'));
+                    $(window).scrollTop(0);
+                    $('#reload-icon').removeClass('loading-rotate');
+                });
+                return false;
+            });
+            window.top.addEventListener('popstate', function(event) {
+                if(!!event.state) {
+                    gotoTarget(event.state, false);
                 }
-            }
-            gotoTarget(target, true);
-            return false;
-        });
-        $(document).on('submit', 'form[action="/post-to-api"]:not(.custom-submit)', function() {
-            $('#reload-icon').addClass('loading-rotate');
-            $.post(this.action, $(this).serialize(), function(_data) {
-                $('#main-content').replaceWith($(_data).find('#main-content'));
-                $(window).scrollTop(0);
-                $('#reload-icon').removeClass('loading-rotate');
+            });*/
+            $(document).on('click', '[logout]', function() {
+                $.get('/api/session/logOut', function(_data) {
+                    window.top.location = '/';
+                });
             });
-            return false;
         });
-        window.top.addEventListener('popstate', function(event) {
-            if(!!event.state) {
-                gotoTarget(event.state, false);
-            }
-        });*/
-        $(document).on('click', '[logout]', function() {
-            $.get('/api/session/logOut', function(_data) {
-                window.top.location = '/';
+    </script>
+
+    <script>
+        $(document).ready(function() {
+            $(function() {
+                $("#sortable-section-templates").sortable({
+                    stop: function(event, ui) {
+                        var sectionTemplates = [];
+                        $('#sortable-section-templates').children('tr').each(function(index, element) {
+                            var sectionTemplateInternalName = $(element).attr('data-internal-name');
+                            console.log(index, sectionTemplateInternalName);
+                            sectionTemplates.push({
+                                positionIndex: index,
+                                internalName: sectionTemplateInternalName
+                            });
+                        })
+                        console.log(sectionTemplates);
+                        $.ajax({
+                            type: "POST",
+                            url: '/api/sectionTemplate/sort',
+                            data: JSON.stringify(sectionTemplates),
+                            contentType: 'application/json',
+                            success: function(response){
+                                console.log(response);
+                            },
+                            dataType: 'json'
+                        });
+                    }
+                });
+                $("#sortable-section-templates").disableSelection();
             });
-        });
-    });
-</script>
+        })
+    </script>
 
 </body>
+
 </html>
-@endif
+@endif

+ 0 - 1
resources/views/layouts/pro.blade.php

@@ -10,7 +10,6 @@
 
     <!-- Fonts -->
     <link href="https://fonts.googleapis.com/css?family=Nunito:200,600,700" rel="stylesheet">
-
     <link rel="stylesheet" href="{{asset('css/lumen.min.css')}}">
     <link rel="stylesheet" href="{{asset('css/toastr.min.css')}}">
 

+ 4 - 0
resources/views/pro/action_items/index.blade.php

@@ -33,6 +33,8 @@
 <th>Signed By Ally Session Id</th>
 <th>Signed By Prescriber Session Id</th>
 <th>To Facility Id</th>
+<th>Facility Memo</th>
+<th>Dose</th>
             </tr>
             </thead>
             <tbody>
@@ -59,6 +61,8 @@
 <td><?= $record->signed_by_ally_session_id ?></td>
 <td><?= $record->signed_by_prescriber_session_id ?></td>
 <td><?= $record->to_facility_id ?></td>
+<td><?= $record->facility_memo ?></td>
+<td><?= $record->dose ?></td>
                 </tr>
             @endforeach
             </tbody>

+ 4 - 0
resources/views/pro/clients_SINGLE/SUB_action_items.blade.php

@@ -35,6 +35,8 @@
 <th>Signed By Ally Session Id</th>
 <th>Signed By Prescriber Session Id</th>
 <th>To Facility Id</th>
+<th>Facility Memo</th>
+<th>Dose</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -61,6 +63,8 @@
 <td><?= $subRecord->signed_by_ally_session_id ?></td>
 <td><?= $subRecord->signed_by_prescriber_session_id ?></td>
 <td><?= $subRecord->to_facility_id ?></td>
+<td><?= $subRecord->facility_memo ?></td>
+<td><?= $subRecord->dose ?></td>
                     </tr>
                 @endforeach
                 </tbody>

+ 4 - 0
resources/views/pro/clients_SINGLE/SUB_erx.blade.php

@@ -35,6 +35,8 @@
 <th>Signed By Ally Session Id</th>
 <th>Signed By Prescriber Session Id</th>
 <th>To Facility Id</th>
+<th>Facility Memo</th>
+<th>Dose</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -61,6 +63,8 @@
 <td><?= $subRecord->signed_by_ally_session_id ?></td>
 <td><?= $subRecord->signed_by_prescriber_session_id ?></td>
 <td><?= $subRecord->to_facility_id ?></td>
+<td><?= $subRecord->facility_memo ?></td>
+<td><?= $subRecord->dose ?></td>
                     </tr>
                 @endforeach
                 </tbody>

+ 4 - 0
resources/views/pro/erx/index.blade.php

@@ -33,6 +33,8 @@
 <th>Signed By Ally Session Id</th>
 <th>Signed By Prescriber Session Id</th>
 <th>To Facility Id</th>
+<th>Facility Memo</th>
+<th>Dose</th>
             </tr>
             </thead>
             <tbody>
@@ -59,6 +61,8 @@
 <td><?= $record->signed_by_ally_session_id ?></td>
 <td><?= $record->signed_by_prescriber_session_id ?></td>
 <td><?= $record->to_facility_id ?></td>
+<td><?= $record->facility_memo ?></td>
+<td><?= $record->dose ?></td>
                 </tr>
             @endforeach
             </tbody>

+ 2 - 0
routes/generated.php

@@ -362,6 +362,8 @@ Route::prefix('/pros/view/{uid}')->group(function () {
 	Route::get('ACTION_setHasAccessToNextPatientButtonToFalse', 'pros_SINGLE_Controller@ACTION_setHasAccessToNextPatientButtonToFalse')->name('pros_SINGLE-ACTION_setHasAccessToNextPatientButtonToFalse');
 	Route::get('ACTION_setCanCreateClientWithInvalidMcnToTrue', 'pros_SINGLE_Controller@ACTION_setCanCreateClientWithInvalidMcnToTrue')->name('pros_SINGLE-ACTION_setCanCreateClientWithInvalidMcnToTrue');
 	Route::get('ACTION_setCanCreateClientWithInvalidMcnToFalse', 'pros_SINGLE_Controller@ACTION_setCanCreateClientWithInvalidMcnToFalse')->name('pros_SINGLE-ACTION_setCanCreateClientWithInvalidMcnToFalse');
+	Route::get('ACTION_setCanAccessRmPortalToTrue', 'pros_SINGLE_Controller@ACTION_setCanAccessRmPortalToTrue')->name('pros_SINGLE-ACTION_setCanAccessRmPortalToTrue');
+	Route::get('ACTION_setCanAccessRmPortalToFalse', 'pros_SINGLE_Controller@ACTION_setCanAccessRmPortalToFalse')->name('pros_SINGLE-ACTION_setCanAccessRmPortalToFalse');
 	Route::get('ACTION_setIsVideoVisitAssistantToTrue', 'pros_SINGLE_Controller@ACTION_setIsVideoVisitAssistantToTrue')->name('pros_SINGLE-ACTION_setIsVideoVisitAssistantToTrue');
 	Route::get('ACTION_setIsVideoVisitAssistantToFalse', 'pros_SINGLE_Controller@ACTION_setIsVideoVisitAssistantToFalse')->name('pros_SINGLE-ACTION_setIsVideoVisitAssistantToFalse');
 	Route::get('ACTION_removeProfilePicture', 'pros_SINGLE_Controller@ACTION_removeProfilePicture')->name('pros_SINGLE-ACTION_removeProfilePicture');

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä