Merge pull request #137 from cinxdy/master

Merge temp
KUBIC-HGU · Sep 27, 2022 · fde061a · fde061a
2 parents 8960a4c + f347e2e
commit fde061a
Show file tree

Hide file tree

Showing 15 changed files with 18,615 additions and 1,260 deletions.
diff --git a/src/app/features/article-analysis/components/abstractAnalysisPage.ts b/src/app/features/article-analysis/components/abstractAnalysisPage.ts
@@ -3,6 +3,7 @@ import * as d3 from 'd3';
 import { AnalysisOnMiddlewareService } from "src/app/core/services/analysis-on-middleware-service/analysis.on.middleware.service";
 import { UserSavedDocumentService } from "src/app/core/services/user-saved-document-service/user-saved-document.service";
 import $ from "jquery";
+import { Router } from "@angular/router";
 
 @Injectable({
     providedIn: "root",
@@ -26,8 +27,21 @@ export abstract class abstractAnalysis{
     constructor(
         private _middlewareService: AnalysisOnMiddlewareService,
         private _userSavedDocumentService: UserSavedDocumentService,
+        private router: Router
       ){};
 
+    toPreprocessing() {
+        this.router.navigateByUrl("/analysis-menu/preprocessing");
+    }
+
+    toAnalysis() {
+        this.router.navigateByUrl("/analysis-menu/analysis");
+    }
+
+    toMyAnalysis(){
+        this.router.navigateByUrl("/userpage/my-analysis");
+    }
+
     onMessage(event){
         let data = JSON.parse(event);
         this.email = data.email;

diff --git a/src/app/features/article-analysis/components/analysis/analysis.component.html b/src/app/features/article-analysis/components/analysis/analysis.component.html
@@ -151,8 +151,10 @@
   <figure id="tree"></figure>
   <figure id="ldavis"></figure>
 
-  <button (click)="saveSvg()" *ngIf="isDataAnalysised">{{'analysis.save2myAnalysis'|translate}}</button>
-  <button (click)="downloadPng()" *ngIf="isDataAnalysised">{{'analysis.downloadChartImage'|translate}}</button>
+  <button (click)="saveSvg()" class="run" *ngIf="isDataAnalysised">{{'analysis.save2myAnalysis'|translate}}</button>
+  <button (click)="downloadPng()" class="run" *ngIf="isDataAnalysised">{{'analysis.downloadChartImage'|translate}}</button>
+
+  <!-- <button (click)="toMyAnalysis()" class="run" *ngIf="isDataAnalysised">내 분석함 이동</button> -->
 
 </section>