Merge pull request #236 from UniRegensburg/development

Beta Version - 4.5.1

LICENSE.md

@@ -1,7 +1,21 @@
-Copyright 2017 - Maxime GRIS
+The MIT License
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Copyright (c) Markus Guder, Gina Maria Wolf, Ewald Reinhardt, Felix Kalley
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

README.md

@@ -1,9 +1,14 @@
 <a>
-<img align="left" src="https://i.imgur.com/GofAwGb.png" width="400px" alt="" />
-<img align="right" src="https://travis-ci.com/UniRegensburg/ASE_WS1718-notenverwaltung.svg?token=q4ZzuewzZrMnM6gfyh2w&branch=master" alt="Build status" /><br><hr>
-</a>
+<img align="left" src="https://i.imgur.com/DAMWNib.png" width="400px" alt="" />
+</a><br><br>
 
 # Introduction
+Notenverwaltung is an application that gives lecturers the opportunity to evaluate students consistently and fairly. Particular focus is placed on the independence of Internet services and the encryption of data. 
+The app was developed during the winter semester 2017/2018 at the University of Regensburg, as main project of the course "Advanced Software Engineering".
+<br><br>
+<a>
+<img align="left" src="https://i.imgur.com/yKiF0x9.jpg" alt="" />
+</a><br>
 
 Currently runs with:
 
@@ -12,13 +17,18 @@ Currently runs with:
 - Electron v1.7.6
 - Electron Packager v9.0.1
 
-## Getting Started
+# Features
 
-Clone this repository locally :
+- Rating :pencil2:
+- Group rating :pencil2: :family:
+- Visualization :chart_with_upwards_trend:
+- Export Data :arrow_up:
+- Import Data :arrow_down:
+- Create schema :memo:
+- Change schema :pencil:
+- Overview of students :clipboard:
 
-``` bash
-git clone https://github.com/UniRegensburg/ASE_WS1718-notenverwaltung.git
-```
+# Getting Started
 
 Install dependencies with npm :
 
@@ -30,8 +40,6 @@ or recommended:
 yarn install
 ```
 
-There is an issue with `yarn` and `node_modules` that are only used in electron on the backend when the application is built by the packager. Please use `npm` as dependencies manager.
-
 If you want to generate Angular components with Angular-cli , you **MUST** install `@angular/cli` in npm global context.  
 Please follow [Angular-cli documentation](https://github.com/angular/angular-cli) if you had installed a previous version of `angular-cli`.
 
@@ -45,7 +53,6 @@ npm install -g @angular/cli
 
 ## To build for production
 
-- Using development variables (environments/index.ts) :  `npm run electron:dev`
 - Using production variables (environments/index.prod.ts) :  `npm run electron:prod`
 
 Your built files are in the /dist folder.
@@ -61,37 +68,14 @@ Your built files are in the /dist folder.
 
 **Your application is optimised. Only the files of /dist folder are included in the executable.**
 
-## Use NodeJS Native libraries
-
-Actually Angular-Cli doesn't seem to be able to import nodeJS native libs or electron libs at compile time (Webpack error). This is (one of) the reason why webpack.config was ejected of ng-cli.
-If you need to use NodeJS native libraries, you **MUST** add it manually in the file `webpack.config.js` in root folder :
-
-```javascript
-  "externals": {
-    "electron": 'require(\'electron\')',
-    "child_process": 'require(\'child_process\')',
-    "fs": 'require(\'fs\')'
-    ...
-  },
-```
-
-Notice that all NodeJS v7 native libs are already added in this sample. Feel free to remove those you don't need.
-
-
-## Execute E2E tests
-
-You can find end-to-end tests in /e2e folder.
 
-You can run tests with the command lines below : 
-- **in a terminal window** -> First, start a web server on port 4200 : `npm run start:web`  
-- **in another terminal window** -> Then, launch Protractor (E2E framework): `npm run e2e`
+# Authors
 
-# Contributors 
+* **Markus Guder** - [Github](https://github.com/marc101101) | [Twitter](https://twitter.com/Markus_Guder) | markus.guder@stud.uni-regensburg.de
+* **Felix Kalley** - [Github](https://github.com/FelixKalley) | felix.kalley@stud.uni-regensburg.de
+* **Ewald Reinhardt** - [Github](https://github.com/Owlwald) | ewald.reinhardt@stud.uni-regensburg.de
+* **Gina Maria Wolf** - [Github](https://github.com/GiMaWolf) | gina-maria.wolf@stud.uni-regensburg.de
 
-<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
-| [<img src="https://avatars3.githubusercontent.com/u/21662088?s=460&v=4" width="100px;"/><br /><sub>Gina Maria Wolf</sub>](https://github.com/GiMaWolf)<br />| [<img src="https://avatars2.githubusercontent.com/u/4850601?s=460&v=4" width="100px;"/><br /><sub>Ewald Reinhardt</sub>](https://github.com/Owlwald)<br />| [<img src="https://avatars0.githubusercontent.com/u/7516526?s=460&v=4" width="100px;"/><br /><sub>Felix Kalley</sub>](https://github.com/FelixKalley)<br />| [<img src="https://avatars2.githubusercontent.com/u/6153088?s=460&v=4" width="100px;"/><br /><sub>Markus Guder</sub>](https://github.com/marc101101)<br /> |
-| :---: | :---: | :---: | :---: | :---: | :---: | :---: |
-<!-- ALL-CONTRIBUTORS-LIST:END -->
 
 
 ## License

package.js

@@ -25,7 +25,6 @@ pack(platform, arch, function done(err, appPath) {
     } else {
         console.log('Application packaged successfuly!', appPath);
     }
-
 });
 
 function pack(plat, arch, cb) {

package.json

@@ -24,15 +24,14 @@
     "electron:serve": "npm run build:electron:main && electron ./dist --serve",
     "electron:test": "electron ./dist",
     "electron:dev": "npm run build && electron ./dist",
-    "electron:prod": "npm run build:prod && electron ./dist",
-    "electron:linux": "npm run build:prod && node package.js --asar --platform=linux --arch=x64",
-    "electron:windows": "npm run build:prod && node package.js --asar --platform=win32 --arch=ia32",
-    "electron:mac": "npm run build:prod && node package.js --asar --platform=darwin --arch=x64",
-    "test": "karma start ./karma.conf.js",
+    "electron:linux": "npm run build && node package.js --asar --platform=linux --arch=x64",
+    "electron:windows": "npm run build && node package.js --asar --platform=win32 --arch=ia32",
+    "electron:mac": "npm run build && node package.js --asar --platform=darwin --arch=x64",
     "pree2e": "webdriver-manager update --standalone false --gecko false --quiet && npm run build",
     "e2e": "protractor ./protractor.conf.js"
   },
   "dependencies": {
+    "@angular/animations": "^5.2.9",
     "@angular/common": "5.0.1",
     "@angular/compiler": "5.0.1",
     "@angular/core": "5.0.1",
@@ -45,14 +44,18 @@
     "@types/pouchdb": "^6.3.2",
     "angular2-csv": "^0.2.5",
     "angular2-indexeddb": "^1.2.2",
+    "angular2-materialize": "^15.1.10",
     "babel-polyfill": "^6.26.0",
     "chart.js": "^2.7.1",
     "core-js": "2.4.1",
     "crypto-js": "^3.1.9-1",
     "enhanced-resolve": "3.3.0",
+    "file-system": "^2.2.2",
     "fs": "0.0.1-security",
+    "hopscotch": "^0.3.1",
     "materialize-css": "^0.100.2",
     "ng2-pagination": "^2.0.2",
+    "ngx-device-detector": "^1.2.2",
     "ngx-pagination": "^3.0.3",
     "pouchdb": "^6.4.1",
     "rxdb": "^7.3.1",
@@ -85,13 +88,6 @@
     "jasmine-core": "2.8.0",
     "jasmine-spec-reporter": "4.2.1",
     "json-loader": "0.5.7",
-    "karma": "1.7.1",
-    "karma-chrome-launcher": "2.2.0",
-    "karma-cli": "1.0.1",
-    "karma-coverage-istanbul-reporter": "1.3.0",
-    "karma-jasmine": "1.1.0",
-    "karma-jasmine-html-reporter": "0.2.2",
-    "karma-sourcemap-loader": "0.3.7",
     "less-loader": "4.0.5",
     "minimist": "1.2.0",
     "mkdirp": "0.5.1",

src/app/app.module.ts

@@ -16,11 +16,20 @@ import { OverviewComponent, StudentsComponent, GradingComponent, ResultsComponen
 
 import { AppRoutingModule } from './app-routing.module';
 
-import { ElectronService, GlobalDataService, ChartService, LastOpened, gripsExportService, flexNowExportService } from './providers/index';
+import { ElectronService, GlobalDataService, ChartService, LastOpened, gripsExportService, flexNowExportService, ToastService, lastSavedService, CheckOsService } from './providers/index';
 
 import { NgxPaginationModule } from 'ngx-pagination';
 
-import {SearchStudentPipe} from './pipes/index';
+import { SearchStudentPipe } from './pipes/index';
+
+import { ToastComponent } from './directives/toast.directive/toast.directive';
+
+import { DeviceDetectorModule } from 'ngx-device-detector';
+
+import 'materialize-css';
+
+import { MaterializeModule} from 'angular2-materialize';
+
 
 @NgModule({
   declarations: [
@@ -34,23 +43,29 @@ import {SearchStudentPipe} from './pipes/index';
     ResultsComponent,
     CorrectionComponent,
     DetailComponent,
-    SearchStudentPipe
+    SearchStudentPipe,
+    ToastComponent
   ],
   imports: [
     BrowserModule,
     FormsModule,
     HttpModule,
     AppRoutingModule,
-    NgxPaginationModule
+    NgxPaginationModule,
+    DeviceDetectorModule.forRoot() ,
+    MaterializeModule
   ],
   providers: [
-    ElectronService, 
-    GlobalDataService, 
-    ChartService, 
-    LastOpened, 
-    gripsExportService, 
+    ElectronService,
+    GlobalDataService,
+    ChartService,
+    LastOpened,
+    gripsExportService,
     SearchStudentPipe,
-    flexNowExportService
+    flexNowExportService,
+    CheckOsService,
+    ToastService,
+    lastSavedService
   ],
   bootstrap: [AppComponent]
 })