Skip to content
Snippets Groups Projects
Commit d35d00cb authored by Martin Mechtel's avatar Martin Mechtel
Browse files

deployment works (build-config)

parent df1598c4
No related branches found
No related tags found
No related merge requests found
......@@ -13,7 +13,7 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist/itc-ng-admin",
"outputPath": "dist/admin",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
......
......@@ -11,7 +11,7 @@ export class BackendService {
@Inject('SERVER_URL') private serverUrl: string,
private http: HttpClient) {
this.serverUrl = this.serverUrl + 'admin/';
}
}
private errorHandler(error: Error | any): Observable<any> {
return Observable.throw(error);
......@@ -200,4 +200,4 @@ export interface GroupResponse {
testsTotal: number;
testsStarted: number;
responsesGiven: number;
}
\ No newline at end of file
}
import { BackendService, GroupResponse } from './../backend/backend.service';
import { MainDatastoreService } from './../maindatastore.service';
import { Component, OnInit, Inject, ViewChild } from '@angular/core';
import { Component, OnInit, ViewChild } from '@angular/core';
import { MatSnackBar, MatSort, MatTableDataSource } from '@angular/material';
......@@ -15,8 +15,7 @@ export class MonitorComponent implements OnInit {
@ViewChild(MatSort) sort: MatSort;
constructor(@Inject('SERVER_URL')
private serverUrl: string,
constructor(
private bs: BackendService,
private mds: MainDatastoreService,
public snackBar: MatSnackBar
......@@ -39,5 +38,5 @@ export class MonitorComponent implements OnInit {
)
}
}
......@@ -20,7 +20,7 @@ import { IqbFileUploadQueueComponent, IqbFileUploadInputForDirective } from '../
export class MyfilesComponent implements OnInit {
public serverfiles: MatTableDataSource<GetFileResponseData>;
public displayedColumns = ['checked', 'filename', 'typelabel', 'filesize', 'filedatetime'];
public uploadUrl = '/uploadFile.php';
public uploadUrl = 'uploadFile.php';
public fileNameAlias = 'fileforopencba';
public dataLoading = false;
......
// The file contents for the current environment will overwrite these during build.
// The build system defaults to the dev environment which uses `environment.ts`, but if you do
// `ng build --env=prod` then `environment.prod.ts` will be used instead.
// The list of which env maps to which file can be found in `.angular-cli.json`.
// ng build --configuration=build --base-href=/admin/
export const environment = {
production: false,
testcenterUrl: '/admin/',
appName: 'IQB-Testcenter',
testcenterUrl: '/',
appName: 'IQB-Testcenter Verwaltung',
appPublisher: 'IQB - Institut zur Qualitätsentwicklung im Bildungswesen',
appVersion: '0.3.1 - 3.6.2018'
appVersion: '0.4.0 - 31.8.2018'
};
export const environment = {
production: true,
testcenterUrl: '/admin/',
testcenterUrl: '/',
appName: 'IQB-Testcenter',
appPublisher: 'IQB - Institut zur Qualitätsentwicklung im Bildungswesen',
appVersion: '0 (prod)'
......
......@@ -6,7 +6,7 @@
export const environment = {
production: false,
testcenterUrl: 'https://ocba2.iqb.hu-berlin.de/',
appName: 'IQB-Testcenter',
appName: 'IQB-Testcenter Verwaltung',
appPublisher: 'IQB - Institut zur Qualitätsentwicklung im Bildungswesen',
appVersion: '0.2 (dev)'
appVersion: '0.4 (dev)'
};
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment