seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'PR81' into develop

pull/82/MERGE
guangyuzhang 2021-11-23 23:16:24 +08:00
parent f812479e7f d7cad1d6e0
commit 8e0bb54616
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
admin/app/controllers/settings/category/energycategory.controller.js
View File

@ -27,7 +27,8 @@ app.controller('EnergyCategoryController', function($scope, $translate,$uibModal
}
});
modalInstance.result.then(function(category) {
CategoryService.addCategory(category, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
CategoryService.addCategory(category, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({
type: "success",
@ -68,7 +69,8 @@ app.controller('EnergyCategoryController', function($scope, $translate,$uibModal
});
modalInstance.result.then(function (modifiedCategory) {
CategoryService.editCategory(modifiedCategory, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
CategoryService.editCategory(modifiedCategory, headers, function (response) {
if(angular.isDefined(response.status) && response.status === 200){
toaster.pop({
type: "success",
@ -106,7 +108,8 @@ app.controller('EnergyCategoryController', function($scope, $translate,$uibModal
closeOnCancel: true },
function (isConfirm) {
if (isConfirm) {
CategoryService.deleteCategory(category, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
CategoryService.deleteCategory(category, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({
type: "success",

22
admin/app/services/settings/category/category.service.js
View File

@ -2,47 +2,47 @@
app.factory('CategoryService', function($http) {
return {
getAllCategories:function(callback){
$http.get(getAPI()+'energycategories')
$http.get(getAPI()+'energycategories')
.then(function (response) {
callback(response);
}, function (response) {
callback(response);
});
},
searchCategories: function(query, callback) {
$http.get(getAPI()+'energycategories', { params: { q: query } })
searchCategories: function(query, headers, callback) {
$http.get(getAPI()+'energycategories', { params: { q: query } }, {headers})
.then(function (response) {
callback(response);
}, function (response) {
callback(response);
});
},
addCategory: function(category, callback) {
$http.post(getAPI()+'energycategories',{data:category})
addCategory: function(category, headers, callback) {
$http.post(getAPI()+'energycategories',{data:category}, {headers})
.then(function (response) {
callback(response);
}, function (response) {
callback(response);
});
},
editCategory: function(category, callback) {
$http.put(getAPI()+'energycategories/'+category.id,{data:category})
editCategory: function(category, headers, callback) {
$http.put(getAPI()+'energycategories/'+category.id,{data:category}, {headers})
.then(function (response) {
callback(response);
}, function (response) {
callback(response);
});
},
deleteCategory: function(category, callback) {
$http.delete(getAPI()+'energycategories/'+category.id)
deleteCategory: function(category, headers, callback) {
$http.delete(getAPI()+'energycategories/'+category.id, {headers})
.then(function (response) {
callback(response);
}, function (response) {
callback(response);
});
},
getCategory: function(id, callback) {
$http.get(getAPI()+'energycategories/'+id)
getCategory: function(id, headers, callback) {
$http.get(getAPI()+'energycategories/'+id, {headers})
.then(function (response) {
callback(response);
}, function (response) {

6
myems-api/core/energycategory.py
View File

@ -3,7 +3,7 @@ import simplejson as json
import mysql.connector
import config
import uuid
from core.useractivity import user_logger
from core.useractivity import user_logger, access_control
class EnergyCategoryCollection:
@ -42,6 +42,7 @@ class EnergyCategoryCollection:
@user_logger
def on_post(req, resp):
"""Handles POST requests"""
access_control(req)
try:
raw_json = req.stream.read().decode('utf-8')
except Exception as ex:
@ -149,6 +150,7 @@ class EnergyCategoryItem:
@staticmethod
@user_logger
def on_delete(req, resp, id_):
access_control(req)
if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_ENERGY_CATEGORY_ID')
@ -231,6 +233,7 @@ class EnergyCategoryItem:
@user_logger
def on_put(req, resp, id_):
"""Handles PUT requests"""
access_control(req)
try:
raw_json = req.stream.read().decode('utf-8')
except Exception as ex:
@ -304,4 +307,3 @@ class EnergyCategoryItem:
cursor.close()
cnx.disconnect()
resp.status = falcon.HTTP_200