Commit c94f8711 authored by Barbora Kompišová's avatar Barbora Kompišová
Browse files

submission filter

parent 20b9d716

package.json

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
    "@fortawesome/free-solid-svg-icons": "^5.1.0-8",

    "@ng-bootstrap/ng-bootstrap": "^1.0.4",

    "angular2-flash-messages": "^2.0.5",

    "angular2-multiselect-dropdown": "^2.9.0",

    "bootstrap": "^4.0.0",

    "core-js": "^2.4.1",

    "font-awesome": "^4.7.0",

src/app/core/core.module.ts

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import {ProjectService} from '../services/project.service'; 
import {LoggedInUserResolver} from '../resolvers/logged-in-user-resolver.service';

import {PermissionsService} from '../services/permissions.service';

import {SubmissionService} from '../services/submission.service';

import {AngularMultiSelectModule} from 'angular2-multiselect-dropdown';



@NgModule({

  imports: [
@@ -43,6 +44,7 @@ import {SubmissionService} from '../services/submission.service'; 
    }),

    AuthModule,

    CoreRoutingModule,

    AngularMultiSelectModule,

    SharedModule // TODO: should not be imported here, only in feature modules

  ],

  declarations: [

src/app/courses/course-detail/course-detail.component.html

+0 −4
Original line number Diff line number Diff line
@@ -40,10 +40,6 @@ 
    </form>

  </div>



  <button class="btn btn-primary" routerLinkActive="active" [routerLink]="['submissions']">

    Manage Submissions

  </button>



  <div class="container">

    <h3>

      Other Resources

src/app/courses/courses-routing.module.ts

+0 −9
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ import {CourseCreateComponent} from './course-create/course-create.component'; 
import {LoggedInUserResolver} from '../resolvers/logged-in-user-resolver.service';

import {CourseResolver} from './course-resolver.service';

import {AdminGuard} from '../guards/admin.guard';

import {SubmissionListComponent} from './submission-list/submission-list.component';



const routes: Routes = [

  {
@@ -31,14 +30,6 @@ const routes: Routes = [ 
      course: CourseResolver

    }

  },

  {

    path: ':cid/submissions',

    component: SubmissionListComponent,

    resolve: {

      loggedInUser: LoggedInUserResolver,

      course: CourseResolver

    }

  },

  {

    path: ':cid/projects',

    loadChildren: 'app/courses/projects/projects.module#ProjectsModule',

src/app/courses/courses.module.ts

+1 −3
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ import {SharedModule} from '../shared/shared.module'; 
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';

import { CourseCreateComponent } from './course-create/course-create.component';

import {CourseResolver} from './course-resolver.service';

import {SubmissionListComponent} from './submission-list/submission-list.component';



@NgModule({

  imports: [
@@ -25,8 +24,7 @@ import {SubmissionListComponent} from './submission-list/submission-list.compone 
  declarations: [

    CourseListComponent,

    CourseDetailComponent,

    CourseCreateComponent,

    SubmissionListComponent

    CourseCreateComponent

  ]

})

export class CoursesModule { }