From d937acd1bb31ae0102b160274b7051c003c21608 Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Fri, 26 Nov 2021 20:05:01 +0800
Subject: [PATCH] fixed issue of EnergyCategory in admin and updated README of
 admin

---
 admin/README.md                                | 18 +++++++++++++++---
 .../category/energycategory.controller.js      | 11 ++++++++---
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/admin/README.md b/admin/README.md
index e3e92fc9..6653e273 100644
--- a/admin/README.md
+++ b/admin/README.md
@@ -14,6 +14,16 @@ nginx-1.18.0 or later
 
 In this section, you will install myems-admin on Docker.
 
+* replace ~~127.0.0.1:8000~~ in nginx.conf with actual **HOST** ip and port of myems-api
+```bash
+cd myems/admin
+nano nginx.conf
+```
+
+```bash
+      proxy_pass http://127.0.0.1:8000/;
+```
+
 * Build a Docker image
 ```bash
 cd myems/admin
@@ -141,6 +151,8 @@ sudo nano /var/www/html/admin/app/api.js
 
 ## References
 
-1.  https://myems.io
-2.  https://dev.mysql.com/doc/connector-python/en/
-3.  https://nginx.org/
\ No newline at end of file
+[1].  https://myems.io
+
+[2].  https://dev.mysql.com/doc/connector-python/en/ 
+
+[3]. https://nginx.org/
\ No newline at end of file
diff --git a/admin/app/controllers/settings/category/energycategory.controller.js b/admin/app/controllers/settings/category/energycategory.controller.js
index fcc0db00..def966a5 100644
--- a/admin/app/controllers/settings/category/energycategory.controller.js
+++ b/admin/app/controllers/settings/category/energycategory.controller.js
@@ -1,7 +1,13 @@
 'use strict';
 
-app.controller('EnergyCategoryController', function($scope, $translate,$uibModal, CategoryService,toaster,SweetAlert) {
-
+app.controller('EnergyCategoryController', function($scope,
+	$window,
+	$translate,
+	$uibModal,
+	CategoryService,
+	toaster,
+	SweetAlert) {
+    $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
 	$scope.getAllCategories = function() {
 		CategoryService.getAllCategories(function (response) {
 			if (angular.isDefined(response.status) && response.status === 200) {
@@ -10,7 +16,6 @@ app.controller('EnergyCategoryController', function($scope, $translate,$uibModal
 				$scope.categories = [];
 			}
 		});
-
 	};
 
 	$scope.addCategory = function() {