From 60fed43352a6f56fff4c5c1dc02776e6d1b662d1 Mon Sep 17 00:00:00 2001
From: Sae126V <saiteja-reddy.vennapusa@stfc.ac.uk>
Date: Tue, 12 Sep 2023 16:29:26 +0000
Subject: [PATCH] [GT-183] Move files to another location

---
 .../controllers/{admin => service_type}/view_service_type.php | 2 +-
 .../{admin => service_type}/view_service_types.php            | 2 +-
 htdocs/web_portal/index.php                                   | 4 ++--
 .../views/{admin => service_type}/view_service_type.php       | 0
 .../views/{admin => service_type}/view_service_types.php      | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename htdocs/web_portal/controllers/{admin => service_type}/view_service_type.php (96%)
 rename htdocs/web_portal/controllers/{admin => service_type}/view_service_types.php (93%)
 rename htdocs/web_portal/views/{admin => service_type}/view_service_type.php (100%)
 rename htdocs/web_portal/views/{admin => service_type}/view_service_types.php (100%)

diff --git a/htdocs/web_portal/controllers/admin/view_service_type.php b/htdocs/web_portal/controllers/service_type/view_service_type.php
similarity index 96%
rename from htdocs/web_portal/controllers/admin/view_service_type.php
rename to htdocs/web_portal/controllers/service_type/view_service_type.php
index 9f86b12c1..77da4bf6b 100644
--- a/htdocs/web_portal/controllers/admin/view_service_type.php
+++ b/htdocs/web_portal/controllers/service_type/view_service_type.php
@@ -48,5 +48,5 @@ function view_service_type()
     $params['AllowMonitoringException'] = $serviceType->getAllowMonitoringException();
     $params['Services'] = $serv->getServices($params['ID']);
 
-    show_view("admin/view_service_type.php", $params, $params['Name']);
+    show_view("service_type/view_service_type.php", $params, $params['Name']);
 }
diff --git a/htdocs/web_portal/controllers/admin/view_service_types.php b/htdocs/web_portal/controllers/service_type/view_service_types.php
similarity index 93%
rename from htdocs/web_portal/controllers/admin/view_service_types.php
rename to htdocs/web_portal/controllers/service_type/view_service_types.php
index 60c8f6106..6f8370fed 100644
--- a/htdocs/web_portal/controllers/admin/view_service_types.php
+++ b/htdocs/web_portal/controllers/service_type/view_service_types.php
@@ -27,5 +27,5 @@ function show_all(){
     $serviceTypes = \Factory::getServiceTypeService()->getServiceTypes();
     $params['ServiceTypes']= $serviceTypes;
 
-    show_view('admin/view_service_types.php', $params, 'Service Types');
+    show_view('service_type/view_service_types.php', $params, 'Service Types');
 }
diff --git a/htdocs/web_portal/index.php b/htdocs/web_portal/index.php
index 1d1d7e2ae..bd64c6129 100644
--- a/htdocs/web_portal/index.php
+++ b/htdocs/web_portal/index.php
@@ -452,12 +452,12 @@ function Draw_Page($Page_Type) {
             break;
         case "Service_Types":
             rejectIfNotAuthenticated();
-            require_once __DIR__.'/controllers/admin/view_service_types.php';
+            require_once __DIR__.'/controllers/service_type/view_service_types.php';
             show_all();
             break;
         case "Service_Type":
             rejectIfNotAuthenticated();
-            require_once __DIR__.'/controllers/admin/view_service_type.php';
+            require_once __DIR__.'/controllers/service_type/view_service_type.php';
             view_service_type();
             break;
         case "Admin_Edit_Service_Type":
diff --git a/htdocs/web_portal/views/admin/view_service_type.php b/htdocs/web_portal/views/service_type/view_service_type.php
similarity index 100%
rename from htdocs/web_portal/views/admin/view_service_type.php
rename to htdocs/web_portal/views/service_type/view_service_type.php
diff --git a/htdocs/web_portal/views/admin/view_service_types.php b/htdocs/web_portal/views/service_type/view_service_types.php
similarity index 100%
rename from htdocs/web_portal/views/admin/view_service_types.php
rename to htdocs/web_portal/views/service_type/view_service_types.php