X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=rulemgt-frontend%2Fsrc%2Fapp%2Fcorrelation-ruleList%2FalarmRule.component.ts;fp=rulemgt%2Fsrc%2Fmain%2Ffrontend%2Fsrc%2Falarm%2Fapp%2Fcorrelation-ruleList%2FalarmRule.component.ts;h=65a5296f64e22e62f790a3125fcf0b5ae2504cf6;hb=9720e7d6a706d79f50778af6a39ce6fba79955ed;hp=af33eec7ba6a284ed48a6b327494b0ec8237cd33;hpb=0b1df79ef7749d62b4412e5433538d32feb6850c;p=holmes%2Frule-management.git

diff --git a/rulemgt/src/main/frontend/src/alarm/app/correlation-ruleList/alarmRule.component.ts b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts
similarity index 84%
rename from rulemgt/src/main/frontend/src/alarm/app/correlation-ruleList/alarmRule.component.ts
rename to rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts
index af33eec..65a5296 100644
--- a/rulemgt/src/main/frontend/src/alarm/app/correlation-ruleList/alarmRule.component.ts
+++ b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts
@@ -85,8 +85,8 @@ export class AlarmRule implements OnInit {
         if (this.ruleModel.enabled == null) {
             this.ruleRequest.enabled = null;
         }
-        this.ruleRequest.rulename = this.ruleModel.rulename;
-        console.log(this.ruleRequest.enabled, this.ruleRequest.rulename);
+        this.ruleRequest.ruleName = this.ruleModel.ruleName;
+        console.log(this.ruleRequest.enabled, this.ruleRequest.ruleName);
 
         this._alarmRuleService
             .searchrules(this.ruleRequest)
@@ -96,11 +96,11 @@ export class AlarmRule implements OnInit {
             });
     }
     updateRule(rule: RuleModel): void {
-        this.router.navigate(['ruleInfo/', rule.ruleid]);
+        this.router.navigate(['ruleInfo/', rule.ruleId]);
     }
 
     delete(rule: RuleModel): void {
-        rule.enabled == 1 ? this.deleteActiveRule(rule) : this.deleteModel(rule.ruleid, this._alarmRuleService, this);
+        rule.enabled == 1 ? this.deleteActiveRule(rule) : this.deleteModel(rule.ruleId, this._alarmRuleService, this);
     }
 
     on_off(rule: RuleModel) {
@@ -113,14 +113,14 @@ export class AlarmRule implements OnInit {
     }
 
     reset(): void {
-        this.ruleModel.rulename = null;
-        this.activeText = "option_all";
+        this.ruleModel.ruleName = null;
+        this.activeText = 'option_all';
         this.ruleModel.enabled = null;
         this.getRules();
     }
 
     deleteActiveRule(rule: RuleModel): void {
-        jQuery("#" + rule.ruleid).popModal({
+        jQuery('#' + rule.ruleId).popModal({
             html: jQuery('#deleteActiveRuleContent'),
             placement: 'leftTop',
             showCloseBut: false,
@@ -129,15 +129,15 @@ export class AlarmRule implements OnInit {
             },
         });
     }
-    deleteModel(ruleid: string, alarm: AlarmRuleService, obj: any): void {
-        jQuery("#" + ruleid).popModal({
+    deleteModel(ruleId: string, alarm: AlarmRuleService, obj: any): void {
+        jQuery('#' + ruleId).popModal({
             html: jQuery('#deleteTimingTaskContent'),
             placement: 'leftTop',
             showCloseBut: false,
             onDocumentClickClose: true,
             onOkBut: function () {
-                jQuery("#deleteTimingTaskDlg").append(jQuery('#deleteTimingTaskContent'));
-                alarm.delete(ruleid);
+                jQuery('#deleteTimingTaskDlg').append(jQuery('#deleteTimingTaskContent'));
+                alarm.delete(ruleId);
                 obj.getRules();
             },
             onCancelBut: function () {
@@ -146,24 +146,26 @@ export class AlarmRule implements OnInit {
     }
 
     ngOnInit(): void {
-        this.activeText = "option_all";
+        this.activeText = 'option_all';
         this.ruleModel = {
-            ruleid: null,
-            rulename: null,
-            description: "",
+            ruleId: null,
+            ruleName: null,
+            description: '',
             content: null,
-            createtime: null,
+            createTime: null,
             creator: null,
-            updatetime: null,
+            updateTime: null,
             modifier: null,
             enabled: 0,
+            loopControlName: ''
         }
         this.ruleRequest = {
-            ruleid: null,
-            rulename: null,
+            ruleId: null,
+            ruleName: null,
             creator: null,
             modifier: null,
             enabled: null,
+            loopControlName: ''
         }
         this.getRules();
     }