/ - Diff - D-Net - D-Net project tracking tool

     import {StatisticsService} from "../utils/services/statistics.service";
     import {Item, Sidebar} from "../utils/entities/sidebar";
     import {SideBarService} from "../library/sharedComponents/sidebar/sideBar.service";
     import {IndicatorUtils} from "../utils/indicator-utils";
     @Component({
       selector: 'monitor',
-...
       public divContents = null;
       public status: number;
       public loading: boolean = true;
       public indicatorUtils: IndicatorUtils = new IndicatorUtils();
       public activeTopic: Topic = null;
       public activeCategory: Category = null;
       public activeSubCategory: SubCategory = null;
-...
+      }
       public getUrlByStakeHolder(indicatorPath: IndicatorPath) {
         return this.sanitizer.bypassSecurityTrustResourceUrl(this.statisticsService.getChartUrl(indicatorPath.source, indicatorPath.getFullUrl()));
         return this.sanitizer.bypassSecurityTrustResourceUrl(
           this.statisticsService.getChartUrl(indicatorPath.source, this.indicatorUtils.getFullUrl(indicatorPath)));
+      }
       public setActiveChart(index, type: string) {

                             <div class="uk-width-1-1">
                               <label class="uk-text-bold">Topic Settings</label>
                               <input class="uk-input uk-form-small" [(ngModel)]="copyTopic.name"
                                      [class.uk-form-danger]="!valid && (!copyTopic.name || copyTopic.name === '')"
                                      [class.uk-form-danger]="!valid && !copyTopic.name"
                                      type="text">
                             </div>
                             <div class="uk-width-1-1">
-...
                           <div class="uk-width-1-1">
                             <label class="uk-text-bold">New Topic</label>
                             <input class="uk-input uk-form-small" [(ngModel)]="copyTopic.name"
                                    [class.uk-form-danger]="!valid && (!copyTopic.name || copyTopic.name === '')"
                                    [class.uk-form-danger]="!valid && !copyTopic.name"
                                    type="text">
                           </div>
                           <div class="uk-width-1-1">

modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/home/home.component.ts
70	70	}
71	71
72	72	public hide(element) {
	73	this.valid = true;
73	74	UIkit.drop(element).hide();
74	75	}
75	76
...	...
95	96	this.copyTopic = HelperFunctions.copy(this.stakeholder.topics[index]);
96	97	}
97	98	this.show(element);
98		this.valid = true;
99	99	}
100	100	}
101	101

       isActiveIcon: string = 'brightness_1';
       public getFullUrl(indicatorPath: IndicatorPath):string{
         let replacedUrl = indicatorPath.chartObject;
         if(indicatorPath.parameters) {
           Object.entries(indicatorPath.parameters).forEach((key, value) => {
             replacedUrl = replacedUrl.replace(ChartHelper.prefix + key + ChartHelper.suffix, value.toString());
           });
+        }
         return indicatorPath.url + encodeURIComponent(replacedUrl);
+      }
       generateIndicatorByChartUrl(url:string):Indicator{
       generateIndicatorByChartUrl(url:string): Indicator{
         let indicator = new Indicator("","","chart","small",true,true,[]);
         let indicatorPath = new IndicatorPath("","","","",[]);
         indicator.indicatorPaths.push(indicatorPath);

         this.parameters = new Map<string, string>();
         this.filters = new Map<string, Map<string,string>>();
+      }
       static createParameters(funderName:string=null, title:string=null, chartType:string=null):Map<string, string>{
         let parameters = new Map<string, string>();
         parameters.set("funder_name",funderName);
-...
         parameters.set("type",chartType);
         return parameters;
+      }
       getFullUrl():string{
         let replacedUrl = this.chartObject;
         this.parameters.forEach((value: string, key: string) => {
           replacedUrl = replacedUrl.replace(ChartHelper.prefix+key+ChartHelper.suffix,value);
         });
         return this.url + encodeURIComponent(replacedUrl);
+      }
+    }

       private openSubject: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
       /**
        *  Set this variable to false on Init of components that is not needed to have sidebar
        *  and on Destroy set this to true.
        *  Add hasSidebar: false on data of route config, if sidebar is not needed.
        */
       private hasSidebarSubject: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(true);

                       <div class="uk-width-1-1">
                         <label class="uk-text-bold">Topic Settings</label>
                         <input class="uk-input uk-form-small" [(ngModel)]="topic.name"
                                [class.uk-form-danger]="!valid && (!topic.name || topic.name === '')" type="text">
                                [class.uk-form-danger]="!valid && !topic.name" type="text">
                       </div>
                       <div class="uk-width-1-1">
                         <label>Description</label>
-...
                 <div class="menu_title uk-inline">
                   {{category.name}}
                   <button class="uk-position-center-right-out uk-margin-right uk-button uk-button-link onHover"
                           (click)="$event.stopPropagation();editCategoryOpen(i, editCategory)">
                           (click)="$event.stopPropagation();editCategoryOpen(editCategory, i);$event.preventDefault()">
                     <i class="material-icons">more_horiz</i>
                   </button>
                 </div>
-...
                       <div class="uk-grid-small" uk-grid>
                         <div class="uk-width-1-1">
                           <label class="uk-text-bold">Category Settings</label>
                           <input class="uk-input uk-form-small" [(ngModel)]="copyCategory.name"
                                  [class.uk-form-danger]="!valid" type="text">
                           <input class="uk-input uk-form-small"
                                  [(ngModel)]="copyCategory.name"
                                  [class.uk-form-danger]="!valid && !copyCategory.name" type="text">
                         </div>
                         <div class="uk-width-1-2">
                           <select class="uk-select uk-form-small" [(ngModel)]="copyCategory.isPublic">
-...
                       <div class="menu_title uk-inline">
                         {{subcategory.name}}
                         <button class="uk-position-center-right-out uk-margin-right uk-button uk-button-link onHover"
                                 (click)="$event.stopPropagation();editSubCategoryOpen(j, editSubCategory);$event.preventDefault()">
                                 (click)="$event.stopPropagation();editSubCategoryOpen(editSubCategory, j);$event.preventDefault()">
                         <i class="material-icons">more_horiz</i>
                       </button>
                       </div>
-...
                               <div class="uk-width-1-1">
                                 <label class="uk-text-bold">Subcategory Settings</label>
                                 <input class="uk-input uk-form-small" [(ngModel)]="copySubCategory.name"
                                        [class.uk-form-danger]="!valid" type="text">
                                        [class.uk-form-danger]="!valid && !copySubCategory.name" type="text">
                               </div>
                               <div class="uk-width-1-2">
                                 <select class="uk-select uk-form-small" [(ngModel)]="copySubCategory.isPublic">
-...
                   </li>
                 </ng-template>
                 <li>
                   <a href="#" (click)="editSubCategoryOpen();$event.preventDefault()">
                   <a href="#" (click)="editSubCategoryOpen(newSubCategory);$event.preventDefault()">
                     <span class="menu_icon"><i class="material-icons">add</i></span>
                     <span class="menu_title">Create new Subcategory</span>
                   </a>
                   <div uk-drop="mode: click; offset: -2; delay-hide: 0" #newSubCategory
                   <div uk-drop="mode: none; offset: -2; delay-hide: 0" #newSubCategory
                        class="uk-padding-large uk-padding-remove-vertical uk-padding-remove-right uk-drop">
                     <div *ngIf="copySubCategory">
                       <div class="md-card">
-...
                             <div class="uk-width-1-1">
                               <label class="uk-text-bold">New Subcategory</label>
                               <input class="uk-input uk-form-small" [(ngModel)]="copySubCategory.name"
                                      [class.uk-form-danger]="!valid" type="text">
                                      [class.uk-form-danger]="!valid && !copySubCategory.name" type="text">
                             </div>
                             <div class="uk-width-1-2">
                               <select class="uk-select uk-form-small" [(ngModel)]="copySubCategory.isPublic">
-...
             </li>
           </ng-template>
           <li>
             <a href="#" (click)="editCategoryOpen();$event.preventDefault()">
             <a href="#" (click)="editCategoryOpen(newCategory);$event.preventDefault()">
               <span class="menu_icon"><i class="material-icons">add</i></span>
               <span class="menu_title">Create new Category</span>
             </a>
             <div uk-drop="mode: click; offset: -2; delay-hide: 0" #newCategory
             <div uk-drop="mode: none; offset: -2; delay-hide: 0" #newCategory
                  class="uk-padding-large uk-padding-remove-vertical uk-padding-remove-right uk-drop">
               <div *ngIf="copyCategory">
                 <div class="md-card">
-...
                       <div class="uk-width-1-1">
                         <label class="uk-text-bold">New Category</label>
                         <input class="uk-input uk-form-small" [(ngModel)]="copyCategory.name"
                                [class.uk-form-danger]="!valid" type="text">
                                [class.uk-form-danger]="!valid && !copyCategory.name" type="text">
                       </div>
                       <div class="uk-width-1-2">
                         <select class="uk-select uk-form-small" [(ngModel)]="copyCategory.isPublic">

modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/topic/topic.component.ts
90	90	}
91	91
92	92	public hide(element) {
	93	this.valid = true;
93	94	UIkit.drop(element).hide();
94	95	}
95	96
...	...
102	103	this.hide(element);
103	104	} else {
104	105	this.topic = HelperFunctions.copy(this.stakeholder.topics[this.topicIndex]);
105		this.valid = true;
106	106	this.show(element);
107	107	}
108	108	}
...	...
140	140	}
141	141	}
142	142
143		public editCategoryOpen(index:number = -1, element = null) {
144		if(index === -1) {
145		this.copyCategory = new Category(null, null, null, true, true);
	143	public editCategoryOpen(element, index:number = -1) {
	144	if(element.className.indexOf('uk-open') !== -1) {
	145	this.hide(element);
146	146	} else {
147		if(element.className.indexOf('uk-open') !== -1) {
148		this.hide(element);
	147	if(index === -1) {
	148	this.copyCategory = new Category(null, null, null, true, true);
149	149	} else {
150	150	this.copyCategory = HelperFunctions.copy(this.stakeholder.topics[this.topicIndex].categories[index]);
151		this.show(element);
152		this.valid = true;
153	151	}
	152	this.show(element);
154	153	}
155	154	}
156	155
...	...
191	190	this.delete('Category has been successfully be deleted', path);
192	191	}
193	192
194		public editSubCategoryOpen(index:number = -1, element = null) {
195		if(index === -1) {
196		this.copySubCategory = new SubCategory(null, null, null, true, true);
	193	public editSubCategoryOpen(element, index:number = -1) {
	194	if(element.className.indexOf('uk-open') !== -1) {
	195	this.hide(element);
197	196	} else {
198		if(element.className.indexOf('uk-open') !== -1) {
199		this.hide(element);
	197	if(index === -1) {
	198	this.copySubCategory = new SubCategory(null, null, null, true, true);
200	199	} else {
201	200	this.copySubCategory = HelperFunctions.copy(this.stakeholder.topics[this.topicIndex].
202	201	categories[this.categoryIndex].subCategories[index]);
203		this.show(element);
204		this.valid = true;
205	202	}
	203	this.show(element);
206	204	}
207	205	}
208	206

     .dashboard #sidebar_main .sidebar_main_header {
       color: #000000;
       height: auto;
       min-height: var(--header-height);
+    }
     .dashboard .header_full #sidebar_main .sidebar_main_header {
       min-height: auto;
+    }
     .dashboard #sidebar_main .menu_section > ul > li > a {
       font-weight: 700;
       font-size: var(--sidebar-font-size);
       color: rgba(0, 0, 0, 0.7);
+    }
     .dashboard #sidebar_main .menu_section > ul > li ul a {
     .dashboard #sidebar_main .menu_section > ul li > a {
       font-size: var(--sidebar-font-size);
       color: rgba(0, 0, 0, 0.7);
+    }

Project

General

Profile

D-Net

Revision 57618

Added by Konstantinos Triantafyllou over 4 years ago