Pre 2021 version

Author: felipelvira

.gitignore

@@ -18,4 +18,6 @@
 
 # System Files
 .DS_Store
-Thumbs.db
+Thumbs.db
+/Playground.puml
+/todo.txt

CGIAR-QA-front/src/app/_helpers/auth.guard.ts

@@ -45,19 +45,19 @@ export class AuthGuard implements CanActivate {
     return false;
   }
 
-  private validateRole(available_roles: [], currentUser) {
+  validateRole(available_roles: [], currentUser) {
     let userRoles = currentUser.roles.map(role => { return role ? role['description'] : null });
     let hasCRP = currentUser.crp ? true : false;
     let found = intersectionWith(available_roles, userRoles, (a, b) => a === b);
     return hasCRP ? hasCRP && found.length > 0 : found.length > 0
   }
 
-  private validateConfig(currentUser) {
+  validateConfig(currentUser) {
     if (!currentUser.config.length) return true;
     if (currentUser.config[0].status !== GeneralStatus.Close) return false;
     return false;
   }
-  private validateCycle(currentUser) {
+  validateCycle(currentUser) {
     let isAssessor = currentUser.roles.map(role => { return role ? role['description'] : null }).find(role => { return role === Role.asesor });
     // console.log('validateCycle',  isAdmin ? false : !currentUser.hasOwnProperty('cycle'));
     return isAssessor && !currentUser.hasOwnProperty('cycle') ? true : false;

CGIAR-QA-front/src/app/_models/crp.model.ts

@@ -1,9 +1,19 @@
 export class CRP {
-    private id: number;
-    private name: string;
-    private crp_id: string;
-    private acronym: string;
-    private is_marlo: boolean;
-    private createdAt?: Date;
-    private updatedAt?: Date;
+    id: number;
+    name: string;
+    crp_id: string;
+    acronym: string;
+    is_marlo: boolean;
+    createdAt?: Date;
+    updatedAt?: Date;
+
+    constructor(id, name, crp_id, acronym, is_marlo) {
+        this.id = id;
+        this.name = name;
+        this.crp_id = crp_id;
+        this.acronym = acronym;
+        this.is_marlo = is_marlo;
+        this.createdAt = new Date();
+        this.updatedAt = new Date();
+    }
 }

CGIAR-QA-front/src/app/_models/user.model.ts

@@ -1,14 +1,24 @@
 export class User {
     id: number;
-    private username: string;
-    private email: string;
-    private password: string;
+    username: string;
+    email: string;
+    password: string;
     roles:any[];
     config:any[];
-    private cycle:any;
-    private indicators:any[];
+    cycle:any;
+    indicators:any[];
     crp:any;
-    private name: string;
-    private cycle_ended:any;
+    name: string;
+    cycle_ended:any;
     token: string;
+
+    // constructor(id, name, crp_id, acronym, is_marlo) {
+    //     this.id = id;
+    //     this.name = name;
+    //     this.crp_id = crp_id;
+    //     this.acronym = acronym;
+    //     this.is_marlo = is_marlo;
+    //     this.createdAt = new Date();
+    //     this.updatedAt = new Date();
+    // }
 }

CGIAR-QA-front/src/app/_shared/alert/alert.component.ts

@@ -5,8 +5,8 @@ import { AlertService } from '../../services/alert.service';
 
 @Component({ selector: 'alert', templateUrl: 'alert.component.html' })
 export class AlertComponent implements OnInit, OnDestroy {
-  private subscription: Subscription;
-  private message: any;
+  subscription: Subscription;
+  message: any;
 
   constructor(private alertService: AlertService) { }
 

CGIAR-QA-front/src/app/_shared/header-bar/header-bar.component.ts

@@ -17,14 +17,14 @@ import { GeneralStatus } from '../../_models/general-status.model';
   styleUrls: ['./header-bar.component.scss']
 })
 export class HeaderBarComponent implements OnInit {
-  private currentUser: User;
-  private allRoles = Role;
-  private generalStatus = GeneralStatus;
-  private indicators = [];
-  private currentRole = '';
-  private params;
+  currentUser: User;
+  allRoles = Role;
+  generalStatus = GeneralStatus;
+  indicators = [];
+  currentRole = '';
+  params;
 
-  private isHome ;
+  isHome ;
 
   constructor(private activeRoute: ActivatedRoute, private authenticationService: AuthenticationService, public router: Router, private indicatorService: IndicatorsService, private alertService: AlertService) {
     this.activeRoute.params.subscribe(routeParams => {
@@ -43,7 +43,7 @@ export class HeaderBarComponent implements OnInit {
 
   }
 
-  private getCurrentRoute(){
+  getCurrentRoute(){
     return this.router.isActive( `/dashboard/${this.currentRole}` , true);
   }
 
@@ -52,7 +52,7 @@ export class HeaderBarComponent implements OnInit {
     // this.getHeaderLinks();
   }
 
-  private goToView(indicator: any) {
+  goToView(indicator: any) {
     // //console.log(this.router.navigate(['/reload']), this.activeRoute.pathFromRoot.toString(), this.router.url.toString().indexOf('/indicator'))
 
     if (indicator === 'logo' || indicator === 'home') {
@@ -66,7 +66,7 @@ export class HeaderBarComponent implements OnInit {
 
   }
 
-  private getHeaderLinks() {
+  getHeaderLinks() {
     if (this.indicators && !this.indicators.length && this.currentUser && !this.isCRP()) {
       this.indicatorService.getIndicatorsByUser(this.currentUser.id).subscribe(
         res => {
@@ -83,7 +83,7 @@ export class HeaderBarComponent implements OnInit {
 
   }
 
-  private isCRP() {
+  isCRP() {
     if (this.currentUser) {
       // let mapped_roles = this.currentUser.roles.map(role => { return role.description });
       // let has_roles = mapped_roles.find(role_ => {
@@ -95,7 +95,7 @@ export class HeaderBarComponent implements OnInit {
     return false;
   }
 
-  private logout() {
+  logout() {
     this.authenticationService.logout();
     this.router.navigate(['/login']);
   }

CGIAR-QA-front/src/app/admin/admin.component.ts

@@ -18,29 +18,29 @@ import { Role } from '../_models/roles.model';
 })
 export class AdminComponent implements OnInit {
 
-  private addUserForm: FormGroup;
-  private editUserForm: FormGroup;
-  private modalRef: BsModalRef;
+  addUserForm: FormGroup;
+  editUserForm: FormGroup;
+  modalRef: BsModalRef;
 
-  private users: User[] = [];
+  users: User[] = [];
 
-  private loading = false;
-  private submitted = false;
-  private selectedRole = '';
-  private allRoles = Role;
-  private suggestedIndicators = [];
+  loading = false;
+  submitted = false;
+  selectedRole = '';
+  allRoles = Role;
+  suggestedIndicators = [];
   // [
   //   'test',
   //   'test1',
   //   'test2',
   //   'test3',
   // ];
-  private modalConfig = {
+  modalConfig = {
     keyboard: true,
     animated: true,
     class: 'custom-confirmation modal-lg'
   };
-  private confirmationData = {
+  confirmationData = {
     text: '',
     title: '',
     type: '',
@@ -80,7 +80,7 @@ export class AdminComponent implements OnInit {
   get t() { return this.editUserForm.get('editUserFormArray') as FormArray; }
 
   // load all users
-  private loadAllUsers() {
+  loadAllUsers() {
     this.loading = true;
     this.showSpinner();
     this.userService.getAllUsers()
@@ -112,7 +112,7 @@ export class AdminComponent implements OnInit {
 
 
   //load all indicators
-  private loadAllIndicators() {
+  loadAllIndicators() {
     this.indicatorService.getIndicators()
       .subscribe(res => {
         this.suggestedIndicators = res.data;
@@ -124,13 +124,13 @@ export class AdminComponent implements OnInit {
 
 
   // change between roles
-  private selectRole(role) {
+  selectRole(role) {
     this.selectedRole = role;
     this.resetForm();
   }
 
   //add new user
-  private addUser() {
+  addUser() {
     this.submitted = true;
 
     // stop here if form is invalid
@@ -168,7 +168,7 @@ export class AdminComponent implements OnInit {
   }
 
   //delete current user
-  private deleteUser(id: string) {
+  deleteUser(id: string) {
     this.loading = true;
     this.showSpinner();
 
@@ -188,7 +188,7 @@ export class AdminComponent implements OnInit {
   }
 
   //save edited users
-  private editUser(user) {
+  editUser(user) {
     user.isEditing = !user.isEditing;
     user.isCollapsed = false;
     let editUserData = {
@@ -210,7 +210,7 @@ export class AdminComponent implements OnInit {
 
 
   //reset forms and field validations
-  private resetForm() {
+  resetForm() {
     this.addUserForm.reset();
     this.addUserForm.controls.name.setErrors(null);
     this.addUserForm.controls.email.setErrors(null);
@@ -224,7 +224,7 @@ export class AdminComponent implements OnInit {
    */
 
   //confirmation logic
-  private openModal(template: TemplateRef<any>, type: string, data: any) {
+  openModal(template: TemplateRef<any>, type: string, data: any) {
     this.confirmationData.type = type;
     this.confirmationData.data = data;
     switch (type) {
@@ -242,7 +242,7 @@ export class AdminComponent implements OnInit {
     this.modalRef = this.modalService.show(template, this.modalConfig);
   }
 
-  private confirm(confirmData: any): void {
+  confirm(confirmData: any): void {
     switch (confirmData.type) {
       case 'delete':
         this.deleteUser(confirmData.data.id)
@@ -258,7 +258,7 @@ export class AdminComponent implements OnInit {
     this.modalRef.hide();
   }
 
-  private decline(): void {
+  decline(): void {
     // this.message = 'Declined!';
     this.modalRef.hide();
   }
@@ -271,15 +271,15 @@ export class AdminComponent implements OnInit {
 
 
   // spinner
-  private showSpinner() {
+  showSpinner() {
     this.spinner.show(undefined,
       {
         fullScreen: true,
         type: "ball-clip-rotate-multiple"
       }
     );
   }
-  private hideSpinner() {
+  hideSpinner() {
     this.spinner.hide();
   }
 

CGIAR-QA-front/src/app/app.component.ts

@@ -11,11 +11,11 @@ declare let gtag: Function;
   styleUrls: ['./app.component.scss']
 })
 export class AppComponent {
-  private title = 'qa-app';
-  private env = environment;
-  private isModalShown = false;
+  title = 'qa-app';
+  env = environment;
+  isModalShown = false;
 
-  @ViewChild('autoShownModal', { static: false }) private autoShownModal: ModalDirective;
+  @ViewChild('autoShownModal', { static: false }) autoShownModal: ModalDirective;
 
   constructor(public router: Router) {
     const isIEOrEdge = /msie\s|trident\/|edge\//i.test(window.navigator.userAgent);
@@ -35,16 +35,16 @@ export class AppComponent {
 
 
 
-  private showModal(): void {
+  showModal(): void {
     this.isModalShown = true;
 
   }
 
-  private hideModal(): void {
+  hideModal(): void {
     this.autoShownModal.hide();
   }
 
-  private onHidden(): void {
+  onHidden(): void {
     this.isModalShown = false;
   }