Merge branch 'dev' of rav.triplestart.com:jmudaka/stagfe2 into dev

app/Http/Controllers/StatTreeLineController.php

@@ -13,6 +13,6 @@ class StatTreeLineController extends Controller
         return view('app.stat-tree-lines.list', compact('statTreeLines'));
     }
     public function dashboard(StatTreeLine $statTreeLine){
-        return view('app.stat-tree-lines.single', compact('statTreeLine'));
+        return view('app.stat-tree.stat-tree-lines.single', compact('statTreeLine'));
     }
 }

resources/views/app/stat-tree/clauses/list.blade.php

@@ -1,41 +1,54 @@
 @extends ('layouts/template')
 @section('content')
-
-<div class="row">
-    <div class="col-md-12">
-        <div class="d-flex align-items-center justify-content-between">
-            <h5>Clauses</h5>
-            <div>
-                <a href="{{ route('practice-management.clauses.replaceAllPage') }}" data-toggle="modal" data-target="#clauseModal" class="btn btn-sm btn-primary">Replace All</a>
+<main role="main" class="stag-content px-0">
+    <div class="p-3 mcp-theme-1">
+        <div class="row">
+            <div class="col-12">
+                <div class="card">
+                    <div class="card-header">
+                        <div class="d-flex align-items-center justify-content-between">
+                            <div>
+                                <h6 class="font-weight-bold mb-0"><i class="far fa-file-code"></i> Clauses</h6>
+                            </div>
+                            <div>
+                                <a href="{{ route('practice-management.clauses.replaceAllPage') }}" class="btn btn-sm btn-primary text-white"><i class="fas fa-pencil-alt"></i> Replace All</a>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="card-body p-0">
+                        <div class="row">
+                            <div class="col-md-12">
+                                <div class="table-responsive">
+                                    <table class="table table-condensed p-0 m-0">
+                                        <thead class="bg-light">
+                                            <tr>
+                                                <th class="border-0">Position Index</th>
+                                                <th class="border-0">Label</th>
+                                                <th class="border-0">Question</th>
+                                                <th class="border-0">Answer</th>
+                                                <th class="border-0">Clause Text</th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            @foreach($clauses as $clause)
+                                            <tr>
+                                                <td>{{ $clause->position_index }}</td>
+                                                <td>{{$clause->label}}</td>
+                                                <td>{{$clause->question}}</td>
+                                                <td>{{ $clause->answer }}</td>
+                                                <td>{{ $clause->clause_text }}</td>
+                                            </tr>
+                                            @endforeach
+                                        </tbody>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
     </div>
-    <div class="col-md-12">
-        <div class="table-responsive">
-            <table class="table">
-                <thead>
-                    <tr>
-                        <th>Position Index</th>
-                        <th>Label</th>
-                        <th>Question</th>
-                        <th>Answer</th>
-                        <th>Clause Text</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    @foreach($clauses as $clause)
-                    <tr>
-                    <td>{{ $clause->position_index }}</td>
-                        <td>{{$clause->label}}</td>
-                        <td>{{$clause->question}}</td>
-                        <td>{{ $clause->answer }}</td>
-                        <td>{{ $clause->clause_text }}</td>                        
-                    </tr>
-                    @endforeach
-                </tbody>
-            </table>
-        </div>
-    </div>
-</div>
+</main>
 
 @endsection

resources/views/app/stat-tree/clauses/replace-all.blade.php

@@ -1,59 +1,71 @@
 @extends ('layouts/template')
 @section('content')
-<div class="row">
-    <div class="col-md-12">
-        <h5>Clauses - Replace All</h5>
-    </div>
-</div>
-<div id="app">
-    <div class="container">
-        <div class="row">
-            <div class="col-md-6">
-                <div class="bg-white p-3">
-                    <h6>TSV</h6>
-                    <div class="input-group">
-                        <textarea v-model="content" class="form-control" rows="10" @change="splitContents"></textarea>
-                    </div>
+
+<main id="replaceAllComponent" role="main" class="stag-content px-0" v-cloak>
+    <div class="p-3 mcp-theme-1">
+        <div class="card">
+            <div class="card-header">
+                <div class="d-flex align-items-center justify-content-between">
+                <h6 class="font-weight-bold">Clauses - Replace All</h6>
+                <div>
+                <a href="{{ route('practice-management.clauses.list') }}" class="btn btn-sm btn-primary text-white"><i class="fas fa-clipboard-list"></i> View Clauses</a>
                 </div>
-            </div>
-            <div class="col-md-6">
-                <div class="bg-white p-3">
-                    <h6>JSON Structure</h6>
-                    <textarea class="form-control" rows="10">@{{jsonStructure}}</textarea>
                 </div>
             </div>
-        </div>
-        <template v-if="rows.length">
-            <div class="row my-3">
-                <div class="col">
-                    <div class="bg-white p-3">
-                        <h6>Table output:</h6>
-                        <div class="table-responsive">
-                            <table class="table table-bordered table-hover">
-                                <tbody>
-                                    <tr v-for="(row, rowIndex) in rows">
-                                        <td v-for="(column, columnIndex) in columns[rowIndex]">
-                                            <input class="border-0" type="text" v-model="columns[rowIndex][columnIndex]" @keyup="updateColumns(rowIndex, columnIndex)">
-                                        </td>
-                                        </td>
-                                </tbody>
-                            </table>
+            <div class="card-body">
+                <div class="row">
+                    <div class="col-md-6">
+                        <div class="bg-white p-3">
+                            <h6 class="font-weight-bold">TSV</h6>
+                            <div class="input-group">
+                                <textarea v-model="content" class="form-control" rows="10" @keyup="splitContents"></textarea>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="bg-white p-3">
+                            <h6 class="font-weight-bold">JSON Structure</h6>
+                            <textarea class="form-control" rows="10">@{{jsonStructure}}</textarea>
                         </div>
                     </div>
                 </div>
-            </div>
-        </template>
-        <div class="row">
-            <div class="col-md-12">
-                <button type="button" class="btn btn-sm btn-primary" @click="submit">Submit</button>
+                <template v-if="rows.length">
+                    <div class="row">
+                        <div class="col">
+                            <div class="bg-white p-3">
+                                <h6 class="font-weight-bold">Table output:</h6>
+                                <div class="table-responsive">
+                                    <table class="table table-bordered table-hover">
+                                        <tbody>
+                                            <tr v-for="(row, rowIndex) in rows">
+                                                <td v-for="(column, columnIndex) in columns[rowIndex]">
+                                                    <input class="border-0" type="text" v-model="columns[rowIndex][columnIndex]" @keyup="updateColumns(rowIndex, columnIndex)">
+                                                </td>
+                                                </td>
+                                        </tbody>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </template>
+
+                <div class="row">
+                    <div class="col-12">
+                        <div class="px-3">
+                            <button type="button" class="btn btn-sm btn-primary" @click="submit">Submit</button>
+                        </div>
+                    </div>
+                </div>
+
             </div>
         </div>
     </div>
-</div>
+</main>
 
 <script type="text/javascript">
-    var app = new Vue({
-        el: '#app',
+    var replaceAllComponent = new Vue({
+        el: '#replaceAllComponent',
         data: {
             content: '',
             rowSplitter: '\n',
@@ -63,6 +75,7 @@
             maxColumn: 0,
             jsonStructure: '',
         },
+        delimiters: ['@{{', '}}'],
         methods: {
             updateColumns(rowIndex, columnIndex) {
                 try {
@@ -104,12 +117,14 @@
                     this.jsonStructure = JSON.stringify([], null, '\t');
                 }
             },
-            submit: function(){
+            submit: function() {
                 var data = JSON.stringify(this.columns);
-                $.post('{{ route("practice-management.api.clause.replaceAll") }}', {data}, function(response){
-                    if(response.success){
-                       fastLoad("{{ route('practice-management.clauses.list') }}");
-                    }else{
+                $.post('{{ route("practice-management.api.clause.replaceAll") }}', {
+                    data
+                }, function(response) {
+                    if (response.success) {
+                        fastLoad("{{ route('practice-management.clauses.list') }}");
+                    } else {
                         alert(response.message);
                     }
                 }, 'json');

resources/views/app/stat-tree/stat-tree-lines/single.blade.php

@@ -1,6 +1,34 @@
 @extends ('layouts/template')
 @section('content')
-
-<?php dump($statTreeLine); ?>
+<main role="main" class="stag-content px-0">
+    <div class="p-3 mcp-theme-1">
+        <div class="card">
+            <div class="card-header">
+                <div class="d-flex align-items-center justify-content-between">
+                    <div class="d-flex align-items-center">
+                        <div class="mr-3">
+                            <span>Tree Name:</span>
+                            <span class="font-weight-bold">{{ $statTreeLine->statTree->name }}</span>
+                        </div>
+                        <div class="mr-3">
+                            <span>Tree Model:</span>
+                            <span class="font-weight-bold">{{ $statTreeLine->statTree->model }}</span>
+                        </div>
+                        <div class="mr-3">
+                            <span>Tree Slug:</span>
+                            <span class="font-weight-bold">{{ $statTreeLine->statTree->slug }}</span>
+                        </div>
+                    </div>
+                    <div>
+                        <a href="" class="btn btn-sm btn-primary text-white"><i class="fas fa-network-wired"></i> View Tree</a>
+                    </div>
+                </div>
+            </div>
+            <div class="card-body">
+			<?php dump($statTreeLine); ?>
+            </div>
+        </div>
+    </div>
+</main>
 
 @endsection

resources/views/app/stat-tree/stat-trees/create.blade.php

@@ -1,34 +1,40 @@
 @extends ('layouts/template')
 @section('content')
 <div id="statTreeComponent" v-cloak>
-    <div class="row">
-        <div class="col-md-12">
-            <h5>Create Stat Tree</h5>
-        </div>
-    </div>
-    <form class="row" @submit.prevent="submit" method="POST">
-        <div class="col-md-4">
-            <div class="form-group">
-                <label>Name</label>
-                <input type="text" class="form-control" name="name" v-model="form.name" required />
-            </div>
-        </div>
-        <div class="col-md-4">
-            <div class="form-group">
-                <label>Model</label>
-                <input type="text" class="form-control" name="table" v-model="form.model" required />
+    <main role="main" class="stag-content px-0">
+        <div class="p-3 mcp-theme-1">
+            <div class="card">
+                <div class="card-header">
+                    <h6 class="font-weight-bold mb-0">Create Stat Tree</h6>
+                </div>
+                <div class="card-body">
+                    <form class="row" @submit.prevent="submit" method="POST">
+                        <div class="col-md-4">
+                            <div class="form-group">
+                                <label>Name</label>
+                                <input type="text" class="form-control" name="name" v-model="form.name" required />
+                            </div>
+                        </div>
+                        <div class="col-md-4">
+                            <div class="form-group">
+                                <label>Model</label>
+                                <input type="text" class="form-control" name="table" v-model="form.model" required />
+                            </div>
+                        </div>
+                        <div class="col-md-4">
+                            <div class="form-group">
+                                <label>Slug</label>
+                                <input type="text" class="form-control" name="slug" v-model="form.slug" required />
+                            </div>
+                        </div>
+                        <div class="col-12">
+                            <button type="submit" class="btn btn-sm btn-primary">Submit</button>
+                        </div>
+                    </form>
+                </div>
             </div>
         </div>
-        <div class="col-md-4">
-            <div class="form-group">
-                <label>Slug</label>
-                <input type="text" class="form-control" name="slug" v-model="form.slug" required />
-            </div>
-        </div>
-        <div class="col-12">
-            <button type="submit" class="btn btn-sm btn-primary">Submit</button>
-        </div>
-    </form>
+    </main>
 </div>
 
 <script type="text/javascript">

resources/views/app/stat-tree/stat-trees/list.blade.php

@@ -1,39 +1,53 @@
 @extends ('layouts/template')
 @section('content')
 
-<div class="row">
-    <div class="col-md-12">
-        <div class="d-flex align-items-center justify-content-between">
-            <h5>Stat Trees</h5>
-            <div>
-                <a href="{{ route('practice-management.statTrees.createPage') }}" class="btn btn-sm btn-primary">Create Tree</a>
+<main role="main" class="stag-content px-0">
+    <div class="p-3 mcp-theme-1">
+        <div class="row">
+            <div class="col-12">
+                <div class="card">
+                    <div class="card-header">
+                        <div class="d-flex align-items-center justify-content-between">
+                            <div>
+                                <h6 class="font-weight-bold mb-0"><i class="fas fa-network-wired"></i> Stat Trees</h6>
+                            </div>
+                            <div>
+                                <a href="{{ route('practice-management.statTrees.createPage') }}" class="btn btn-sm btn-primary text-white"><i class="fas fa-folder-plus"></i> Create Tree</a>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="card-body p-0">
+                        <div class="row">
+                            <div class="col-md-12">
+                                <div class="table-responsive">
+                                    <table class="table table-condensed p-0 m-0">
+                                        <thead class="bg-light">
+                                            <tr>
+                                                <th class="border-0">ID</th>
+                                                <th class="border-0">Name</th>
+                                                <th class="border-0">Model</th>
+                                                <th class="border-0">Slug</th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            @foreach($statTrees as $statTree)
+                                            <tr>
+                                                <td><a href="{{ route('practice-management.statTrees.view.dashboard', $statTree) }}">{{ $statTree->id }}</a></td>
+                                                <td>{{ $statTree->name }}</td>
+                                                <td>{{ $statTree->model }}</td>
+                                                <td>{{ $statTree->slug }}</td>
+                                            </tr>
+                                            @endforeach
+                                        </tbody>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
     </div>
-    <div class="col-md-12">
-        <div class="table-responsive">
-            <table class="table">
-                <thead>
-                    <tr>
-                        <th>ID</th>
-                        <th>Name</th>
-                        <th>Model</th>
-                        <th>Slug</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    @foreach($statTrees as $statTree)
-                    <tr>
-                        <td><a href="{{ route('practice-management.statTrees.view.dashboard', $statTree) }}">{{ $statTree->id }}</a></td>
-                        <td>{{ $statTree->name }}</td>
-                        <td>{{ $statTree->model }}</td>
-                        <td>{{ $statTree->slug }}</td>
-                    </tr>
-                    @endforeach
-                </tbody>
-            </table>
-        </div>
-    </div>
-</div>
+</main>
 
 @endsection

resources/views/app/stat-tree/stat-trees/single.blade.php

@@ -1,24 +1,35 @@
 @extends ('layouts/template')
 @section('content')
 
-<div class="row">
-    <div class="col-md-12">
-        <div class="d-flex align-items-center justify-content-between">
-            <div class="d-flex align-items-center">
-            <h6 class="me-3">Name: {{ $statTree->name }}</h6>
-            <h6 class="me-3">Model: {{ $statTree->model }}</h6>
-            <h6 class="me-3">Slug: {{ $statTree->slug }}</h6>
+<main role="main" class="stag-content px-0">
+    <div class="p-3 mcp-theme-1">
+        <div class="card">
+            <div class="card-header">
+                <div class="d-flex align-items-center justify-content-between">
+                    <div class="d-flex align-items-center">
+                        <div class="mr-3">
+                            <span>Name:</span>
+                            <span class="font-weight-bold">{{ $statTree->name }}</span>
+                        </div>
+                        <div class="mr-3">
+                            <span>Model:</span>
+                            <span class="font-weight-bold">{{ $statTree->model }}</span>
+                        </div>
+                        <div class="mr-3">
+                            <span>Slug:</span>
+                            <span class="font-weight-bold">{{ $statTree->slug }}</span>
+                        </div>
+                    </div>
+                    <div>
+                        <a href="" class="btn btn-sm btn-primary text-white"><i class="fas fa-network-wired"></i> View All Stat Trees</a>
+                    </div>
+                </div>
             </div>
-            <div>
-                <form class="d-inline" action="{{ route('practice-management.api.statTree.delete', $statTree) }}" method="POST">
-                    @csrf
-                    <input type="hidden" name="id" value="{{ $statTree->id }}" />
-                    <button class="btn btn-sm btn-danger">Delete</button>
-                </form>
+            <div class="card-body">
+                @yield('page')
             </div>
         </div>
     </div>
-</div>
-@yield('page')
+</main>
 
 @endsection

resources/views/app/stat-tree/stat-trees/sub/dashboard.blade.php

@@ -1,51 +1,56 @@
 @extends('app.stat-tree.stat-trees.single')
 @section('page')
 
-<h1>Lines</h1>
-
-<table class="table">
-    <thead>
-        <tr>
-            <th>#</th>
-            <th>Clauses</th>
-            <th>Query</th>
-            <th>Count</th>
-        </tr>
-    </thead>
-    @foreach($statTree->lines as $line)
-    <tr>
-        <td>
-            <a href="{{ route('practice-management.statTreeLines.view.dashboard', $line) }}">
-            {{ $line->tree_order_position_index }}
-            </a>
-        </td>
-        <td>
-            @foreach($line->lineClauses as $c)
-                | {{ $c->clause_label }}
-            @endforeach
-        </td>
-        <td>
-            SELECT COUNT(*) FROM {{ $statTree->model }} WHERE
-            @foreach($line->lineClauses as $c)
-                {{ $c->clause->clause_text }} @if(!$loop->last) AND @endif
-            @endforeach
-        </td>
-        <td>
-            {{ $line->last_refresh_count }}
-        </td>
-    </tr>
-    @endforeach
-</table>
-
-<hr>
-<h2>Replace Stat Tree Lines</h2>
+<div class="row">
+    @if(count($statTree->lines))
+    <div class="col-12">
+        <h6 class="font-weight-bold">Lines</h6>
+        <div class="table-responsive">
+            <table class="table table-condensed border p-0 m-0">
+                <thead class="bg-light">
+                    <tr>
+                        <th class="border-bottom-0">#</th>
+                        <th class="border-bottom-0">Clauses</th>
+                        <th class="border-bottom-0">Query</th>
+                        <th class="border-bottom-0">Count</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @foreach($statTree->lines as $line)
+                    <tr>
+                        <td>
+                            <a href="{{ route('practice-management.statTreeLines.view.dashboard', $line) }}">
+                                {{ $line->tree_order_position_index }}
+                            </a>
+                        </td>
+                        <td>
+                            @foreach($line->lineClauses as $c)
+                            | {{ $c->clause_label }}
+                            @endforeach
+                        </td>
+                        <td>
+                            SELECT COUNT(*) FROM {{ $statTree->model }} WHERE
+                            @foreach($line->lineClauses as $c)
+                            {{ $c->clause->clause_text }} @if(!$loop->last) AND @endif
+                            @endforeach
+                        </td>
+                        <td>
+                            {{ $line->last_refresh_count }}
+                        </td>
+                    </tr>
+                    @endforeach
+                </tbody>
+            </table>
+        </div>
+    </div>
+    @endif
 
-<div id="app">
-    <div class="container">
+    <div id="app" class="col-12">
+        <h6 class="font-weight-bold bg-light p-3 mt-3">Replace Stat Tree Lines</h6>
         <div class="row">
             <div class="col-md-6">
                 <div class="bg-white p-3">
-                    <h6>TSV</h6>
+                    <h6 class="font-weight-bold">TSV</h6>
                     <div class="input-group">
                         <textarea v-model="content" class="form-control" rows="10" @keyup="splitContents"></textarea>
                     </div>
@@ -53,7 +58,7 @@
             </div>
             <div class="col-md-6">
                 <div class="bg-white p-3">
-                    <h6>JSON Structure</h6>
+                    <h6 class="font-weight-bold">JSON Structure</h6>
                     <textarea class="form-control" rows="10">@{{jsonStructure}}</textarea>
                 </div>
             </div>
@@ -62,7 +67,7 @@
             <div class="row my-3">
                 <div class="col">
                     <div class="bg-white p-3">
-                        <h6>Table output:</h6>
+                        <h6 class="font-weight-bold">Table output:</h6>
                         <div class="table-responsive">
                             <table class="table table-bordered table-hover">
                                 <tbody>
@@ -80,11 +85,14 @@
         </template>
         <div class="row">
             <div class="col-md-12">
-                <button type="button" class="btn btn-sm btn-primary" @click="submit">Submit</button>
-                <button type="button" class="btn btn-sm btn-secondary" @click="generateAutoFilledJson">Fill</button>
+                <div class="px-3">
+                    <button type="button" class="btn btn-sm btn-primary" @click="submit">Submit</button>
+                    <button type="button" class="btn btn-sm btn-secondary" @click="generateAutoFilledJson">Fill</button>
+                </div>
             </div>
         </div>
     </div>
+
 </div>
 
 <script src="{{ asset('js/tsvToArray.js') }}"></script>
@@ -102,6 +110,7 @@
             jsonStructure: '',
             isAutoFilled: false
         },
+        delimiters: ['@{{', '}}'],
         methods: {
             updateColumns(rowIndex, columnIndex) {
                 try {
@@ -184,11 +193,7 @@
                 })
             }
         }
-    })
-
-    // Sam, write a function that takes the tsv array to text please. T
-    // Sorry, i haven't understood you well
-    //What if I add extra function to auto-fill his empty cells?
+    });
 </script>
 
-@endsection
+@endsection