ソースを参照

Merge branch 'feature-CI_CD' of onunez/frontend-inversiones into development

Oscar José Nuñez Chávez 5 年 前
コミット
69c9c9fd2a

+ 27 - 0
Jenkinsfile

@@ -0,0 +1,27 @@
+pipeline {
+    agent any
+    stages {
+        stage('build') {
+            steps {
+                sh  '''
+                    cd /home/administrador/Documentos/GIT/Inversys/app/frontend/
+				    git pull
+                    '''
+            }
+        }
+        stage('Test') {
+            steps {
+                echo 'Testing..'
+            }
+        }
+        stage('Deploy') {
+            steps {
+                sh  '''
+                    cd /home/administrador/Documentos/GIT/Inversys/
+                    echo $USER
+				    docker-compose up -d --build frontend
+                    '''
+            }
+        }
+    }
+}

+ 2 - 2
src/app/components/investment-proposals/investment-proposals.component.ts

@@ -79,7 +79,7 @@ export class InvestmentProposalsComponent implements OnInit {
     this.investmentsService.getProposalInvestmentsList().subscribe(
       ans => {
         this.listProposals = ans.result;
-
+        /*
         if (this.userType(this.userRole, "analistas")) {
           this.listProposals;
         } else if (this.userType(this.userRole, "contabilidad")) {
@@ -100,7 +100,7 @@ export class InvestmentProposalsComponent implements OnInit {
               proposals["id_estado_inversion"]["codigo"]
             )
           );
-        }
+        }*/
 
         this.dataSource.data = this.listProposals;
         this.dataSource.paginator = this.paginator;