Samson Mutunga 2 yıl önce
ebeveyn
işleme
cfb46b88cb

+ 3 - 3
resources/views/app/admin/management-stats/filters.blade.php

@@ -22,7 +22,7 @@
 		margin-bottom: 10px;
 	}
 </style>
-<form id="admin-management-stats-filters" method="GET" action="{{ route('super-admin.management-stats') }}" class="filter-container" v-cloak>
+<form id="admin-management-stats-filters" method="GET" action="{{ route('management-stats') }}" class="filter-container" v-cloak>
 	<div class="sm-section">
 		<div class="">
 			<label>Start Month:</label>
@@ -43,7 +43,7 @@
 			<label>&nbsp;</label>
 			<div class=" d-flex">
 				<button type="button" v-on:click.prevent="doSubmit()" class="btn btn-primary btn-sm mr-2"><i class="fas fa-filter"></i> Filter</button>
-				<a href="#" v-on:click.prevent="fastLoad('{{route('super-admin.management-stats')}}')" class="btn btn-link btn-sm text-danger">Clear</a>
+				<a href="#" v-on:click.prevent="fastLoad('{{route('management-stats')}}')" class="btn btn-link btn-sm text-danger">Clear</a>
 			</div>
 		</div>
 	</div>
@@ -75,7 +75,7 @@ for ($i=0; $i < count($allFilterKeys); $i++) {
 
 					},
 					doSubmit: function() {
-						fastLoad("{{ route('super-admin.management-stats') }}?" + $('#admin-management-stats-filters').serialize());
+						fastLoad("{{ route('management-stats') }}?" + $('#admin-management-stats-filters').serialize());
 						return false;
 					}
 				},

+ 11 - 50
resources/views/app/admin/management-stats/index.blade.php

@@ -50,16 +50,15 @@
                     activeClients: <?= json_encode($activeClients) ?>,
                 },
                 methods: {
-                    initClientsWePaidToAcquire: function() {
-                        var data = this.clientsWePaidToAcquire;
+                    dateValueDataObjectBarGraph: function (data, dateLabel, valueLabel, chartID, yAxisLegend){
                         var dates = [];
                         var values = [];
                         for(var i = 0; i < data.length; i++){
                             var d = data[i];
-                            dates.push(d.date_trunc);
-                            values.push(d.count);
+                            dates.push(d[dateLabel]);
+                            values.push(d[valueLabel]);
                         }
-                        var elementID = "#clientsWePaidToAcquire";
+                        var elementID = chartID;
                         var myData = {};
 
                         myData.x = 'x';
@@ -68,7 +67,7 @@
                         myX = dates;
                         myY = values;
                         myX.splice(0, 0, 'x');
-                        myY.splice(0, 0, 'Clients we paid to acquire');
+                        myY.splice(0, 0, yAxisLegend);
                         myData.columns = [];
                         myData.columns.push(myX);
                         myData.columns.push(myY);
@@ -97,52 +96,14 @@
                             }
                         })
                     },
+                    initClientsWePaidToAcquire: function() {
+                        var data = this.clientsWePaidToAcquire;
+                        this.dateValueDataObjectBarGraph(data, 'date_trunc', 'count', '#clientsWePaidToAcquire', 'Clients we paid to acquire');
+                        
+                    },
                     initActiveClients: function() {
                         var data = this.activeClients;
-                        var dates = [];
-                        var values = [];
-                        for(var i = 0; i < data.length; i++){
-                            var d = data[i];
-                            dates.push(d.date_trunc);
-                            values.push(d.count);
-                        }
-                        var elementID = "#activeClients";
-                        var myData = {};
-
-                        myData.x = 'x';
-                        myData.xFormat = "%Y-%m-%d";
-                        myData.type = 'bar';
-                        myX = dates;
-                        myY = values;
-                        myX.splice(0, 0, 'x');
-                        myY.splice(0, 0, 'Active Clients');
-                        myData.columns = [];
-                        myData.columns.push(myX);
-                        myData.columns.push(myY);
-                        var chart = c3.generate({
-                            bindto: elementID,
-                            data: myData,
-                            size: {
-                                height: 480,
-                                width: 400,
-                            },
-                            bar: {
-                                width: {
-                                    ratio: 0.5 // this makes bar width 50% of length between ticks
-                                }
-                                // or
-                                //width: 100 // this makes bar width 100px
-                            },
-                            axis: {
-                                x: {
-                                    type: 'timeseries',
-                                    tick: {
-                                        format: "%b-%d"
-                                    }
-                                },
-
-                            }
-                        })
+                        this.dateValueDataObjectBarGraph(data, 'date_trunc', 'count', '#activeClients', 'Active Clients');
                     },
                     init: function() {
                         this.initClientsWePaidToAcquire();

+ 1 - 1
routes/web.php

@@ -234,7 +234,7 @@ Route::middleware('pro.auth')->group(function () {
         Route::get('get-create-new-patient-script-template', 'AdminController@getCreateNewPatientScriptTemplate')->name('getCreateNewPatientScriptTemplate');
         Route::get('patients-missing-defult-settings', 'AdminController@patientsMissingDefasultSettings')->name('patientsMissingDefasultSettings');
     });
-    Route::name('super-admin.')->prefix('super-admin')->middleware('pro.auth.admin')->group(function () {
+    Route::middleware('pro.auth.admin')->group(function () {
         Route::get('mgmt-stats', [ManagementStatsController::class, 'index'])->name('management-stats');
     });