From 22d51c540d6825e5276c37852f23c16fabffac0c Mon Sep 17 00:00:00 2001
From: ievavold <ievavold@wisc.edu>
Date: Tue, 4 Jun 2019 15:57:50 -0500
Subject: [PATCH] fix local api requests
---
.../metadata-table.component.html | 2 +-
src/app/dars/services/api.service.ts | 17 ++++++++++++-----
src/environments/environment.ts | 2 +-
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/app/dars/metadata-table/metadata-table.component.html b/src/app/dars/metadata-table/metadata-table.component.html
index 73f1377..c0e8f55 100644
--- a/src/app/dars/metadata-table/metadata-table.component.html
+++ b/src/app/dars/metadata-table/metadata-table.component.html
@@ -1,5 +1,5 @@
<div id="audits">
- <table class="audit-table" mat-table [dataSource]="metadata$ | async">
+ <table class="audit-table" mat-table [dataSource]="metadata$">
<!-- View Column -->
<ng-container matColumnDef="view">
diff --git a/src/app/dars/services/api.service.ts b/src/app/dars/services/api.service.ts
index ec1b9de..e07d093 100644
--- a/src/app/dars/services/api.service.ts
+++ b/src/app/dars/services/api.service.ts
@@ -6,6 +6,7 @@ import { AuditMetadata } from '../models/audit-metadata';
import { StudentDegreeProgram } from '../models/student-degree-program';
import { environment } from './../../../environments/environment';
import { Audit } from '../models/audit';
+import { map } from 'rxjs/operators';
const auditResponse: any = require('../../../assets/mock-data/audit-response.json');
@@ -33,17 +34,23 @@ export class DarsApiService {
/**
* Get a students degree programs.
*/
- public getStudentDegreePrograms(emplid: number) {
- const url = `${environment.apiDarsUrl}/student-degree-programs/${emplid}`;
- return this.http.get<StudentDegreeProgram[]>(url, HTTP_OPTIONS);
+ public getStudentDegreePrograms(
+ _emplid: number,
+ ): Observable<StudentDegreeProgram[]> {
+ const url = `${environment.apiDarsUrl}/studentplans`;
+ return this.http
+ .get<string>(url, HTTP_OPTIONS)
+ .pipe(map(JSON.parse.bind(JSON)));
}
/**
* Get audit metadata for all audits a user has.
*/
public getAudits(): Observable<AuditMetadata[]> {
- const url = `${environment.apiDarsUrl}/audit-metadata`;
- return this.http.get<AuditMetadata[]>(url, HTTP_OPTIONS);
+ const url = `${environment.apiDarsUrl}/auditmetadata`;
+ return this.http
+ .get<string>(url, HTTP_OPTIONS)
+ .pipe(map(JSON.parse.bind(JSON)));
}
/**
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index e1812ea..1735cfd 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -9,7 +9,7 @@ export const environment = {
apiPlannerUrl: '/api/planner/v1',
apiSearchUrl: '/api/search/v1',
apiEnrollUrl: '/api/enroll/v1',
- apiDarsUrl: 'https://gateway.test.api.wisc.edu/v1/dars',
+ apiDarsUrl: '/api/dars',
snackbarDuration: 4000,
useNewDARSView: true,
};
--
GitLab