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

submission list v1, detail

parent 09175216

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -41,6 +41,11 @@ const appRoutes: Routes = [ 
        loadChildren: 'app/courses/courses.module#CoursesModule',

        loadChildren: 'app/courses/courses.module#CoursesModule',

        canLoad: [AuthenticatedGuard] // duplicate check?

        canLoad: [AuthenticatedGuard] // duplicate check?

      },

      },

      {

        path: 'submissions',

        loadChildren: 'app/submissions/submissions.module#SubmissionsModule',

        canLoad: [AuthenticatedGuard]

      }

    ]

    ]

  },

  },

  {

  {

src/app/core/core.module.ts

+2 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ import {AdminOrOwnGuard} from '../guards/admin-or-own.guard'; 
import {ProjectService} from '../services/project.service';

import {ProjectService} from '../services/project.service';

import {LoggedInUserResolver} from '../resolvers/logged-in-user-resolver.service';

import {LoggedInUserResolver} from '../resolvers/logged-in-user-resolver.service';

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

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

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





@NgModule({

@NgModule({

  imports: [

  imports: [
@@ -55,6 +56,7 @@ import {PermissionsService} from '../services/permissions.service'; 
    CourseService,

    CourseService,

    ProjectService,

    ProjectService,

    PermissionsService,

    PermissionsService,

    SubmissionService,

    AuthenticatedGuard,

    AuthenticatedGuard,

    UnauthenticatedGuard,

    UnauthenticatedGuard,

    GitlabLoginGuard,

    GitlabLoginGuard,

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

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

    </form>

  </div>

  </div>





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

    Manage Submissions

  </button>



  <div class="container">

  <div class="container">

    <h3>

    <h3>

      Other Resources

      Other Resources

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

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

import {LoggedInUserResolver} from '../resolvers/logged-in-user-resolver.service';

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

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

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

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

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





const routes: Routes = [

const routes: Routes = [

  {

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

      course: CourseResolver

    }

    }

  },

  },

  {

    path: ':cid/submissions',

    component: SubmissionListComponent,

    resolve: {

      loggedInUser: LoggedInUserResolver,

      course: CourseResolver

    }

  },

  {

  {

    path: ':cid/projects',

    path: ':cid/projects',

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

    loadChildren: 'app/courses/projects/projects.module#ProjectsModule',
@@ -40,11 +49,11 @@ const routes: Routes = [ 
  },

  },

  /*

  /*

  {

  {

    path: ':id/groups',

    path: ':cid/groups',

    loadChildren: 'app/courses/groups/groups.module#GroupsModule'

    loadChildren: 'app/courses/groups/groups.module#GroupsModule'

  },

  },

  {

  {

    path: ':id/roles',

    path: ':cid/roles',

    loadChildren: 'app/courses/roles/roles.module#RolesModule'

    loadChildren: 'app/courses/roles/roles.module#RolesModule'

  }*/

  }*/

];

];

src/app/courses/courses.module.ts

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

import { NgbModule } from '@ng-bootstrap/ng-bootstrap';

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

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

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

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

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





@NgModule({

@NgModule({

  imports: [

  imports: [
@@ -24,7 +25,8 @@ import {CourseResolver} from './course-resolver.service'; 
  declarations: [

  declarations: [

    CourseListComponent,

    CourseListComponent,

    CourseDetailComponent,

    CourseDetailComponent,

    CourseCreateComponent

    CourseCreateComponent,

    SubmissionListComponent

  ]

  ]

})

})

export class CoursesModule { }
 
export class CoursesModule { }