From 16f4edff4a7267b7ffedb2722f0b36509ee54b84 Mon Sep 17 00:00:00 2001
From: Ravi Gulhane <ravi@stratawiz.com>
Date: Tue, 24 May 2022 07:18:00 +0530
Subject: [PATCH] Changes

---
 app/Http/Controllers/Controller.php          |  2 +-
 app/Http/Controllers/HierarchyController.php |  4 ++++
 app/Http/Controllers/PositionController.php  | 11 +++++++++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 21ffd9f3..e2c7a190 100755
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -245,7 +245,7 @@ class Controller extends BaseController
         //echo '<pre>'; print_r($values); exit;
         $data = $this->_beforeform($type, $values);
     	$fields = $this->get_form_fields($type, $values);
-        //echo '<pre>'; print_r($data); exit;
+        //echo '<pre>'; print_r($fields); exit;
         return $this->view('form')->with([
         	'title' => $this->_title,
         	'mode' => $type,
diff --git a/app/Http/Controllers/HierarchyController.php b/app/Http/Controllers/HierarchyController.php
index d9bacb7e..d9b020d1 100644
--- a/app/Http/Controllers/HierarchyController.php
+++ b/app/Http/Controllers/HierarchyController.php
@@ -70,11 +70,15 @@ class HierarchyController extends Controller
         $data = $request->except('_token');
         $data['roles'] = [$data['roles']];
         $data['channels'] = [$data['channels']];
+        $data['source'] = 'hierarchy';
+
+        
         if($data['id'] != '') {
             $response = LambdaRequest::signedrequest('post', $this->_service, 'hierarchy/update', $data);
         } else {
             $response = LambdaRequest::signedrequest('post', $this->_service, 'hierarchy/create', $data);
         }
+        //echo '<pre>'; print_r($response); exit;
         if($response->statusCode == 200 && $response->status == "success") {
             return redirect($this->_base_url.'s')->withMessage('Successfully Saved !!!');
         } else {
diff --git a/app/Http/Controllers/PositionController.php b/app/Http/Controllers/PositionController.php
index 45d289b8..2f81a72c 100644
--- a/app/Http/Controllers/PositionController.php
+++ b/app/Http/Controllers/PositionController.php
@@ -60,11 +60,18 @@ class PositionController extends Controller
         // foreach($users->data->items as $user){
         //     $users_dd[$user->id] = $user->firstname . ' ' . $user->lastname . ' (' . $user->employee_code . ')';
         // }
+        $domain = LambdaRequest::signedrequest('get', $this->_service, 'domain/get_one');
+
+        $roles_dd = [];
+        foreach($domain->data->item->designations as $role){
+            $roles_dd[$role] = $role;
+        }
+
         return [
             'name' => ['title' => 'Position Name', 'type' => 'text', 'required' => true],
             'code' => ['title' => 'Position Code', 'type' => 'text', 'required' => true],
-            'type' => ['title' => 'Type', 'type' => 'text', 'required' => true],
-            'designation' => ['title' => 'Designation', 'type' => 'text', 'required' => true],
+            'type' => ['title' => 'Type', 'type' => 'select', 'required' => true, 'values' => ['Territory' => 'Territory', 'Area' => 'Area', 'Region' => 'Region', 'Zone' => 'Zone', 'Country' => 'Country' ] ],
+            'designation' => ['title' => 'Designation', 'type' => 'select', 'required' => true, 'values' => $roles_dd ],
             'status' => ['title' => 'Status', 'type' => 'select', 'required' => true, 'values' => ['active' => 'Active', 'disabled' => 'Disabled'] ],
         ];
     }