Skip to content

Commit

Permalink
TimeTable management component added,to manage previously generated t…
Browse files Browse the repository at this point in the history
…imetables.
  • Loading branch information
RbkGh committed Mar 20, 2017
1 parent 0b36000 commit 6e3d4a1
Show file tree
Hide file tree
Showing 6 changed files with 71 additions and 5 deletions.
7 changes: 6 additions & 1 deletion src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import {TutorFiltrationService} from "./services/tutor-filtration.service";
import {ProgrammeGroupFiltrationService} from "./services/programme-group-filtration.service";
import {SubjectFiltrationService} from "./services/subject-filtration.service";
import {TimeTableGenerationService} from "./services/time-table-generation.service";
import { TimeTableMgmtComponent } from './components/main-content/time-table-mgmt/time-table-mgmt.component';

const appRoutes: Routes = [
{
Expand Down Expand Up @@ -59,7 +60,10 @@ const appRoutes: Routes = [
path: 'departmentassign', component: DepartmentTutorAssignmentComponent
},
{
path: 'timetable', component: TimeTableComponent
path: 'timetable-generation', component: TimeTableComponent
},
{
path : 'timetable-mgmt',component : TimeTableMgmtComponent
}
]
}
Expand All @@ -85,6 +89,7 @@ const appRoutes: Routes = [
Error404Component,
SubjectAllocationComponent,
DepartmentTutorAssignmentComponent,
TimeTableMgmtComponent,
],
imports: [
BrowserModule,
Expand Down
23 changes: 19 additions & 4 deletions src/app/components/left-side-bar/left-side-bar.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,26 @@

</li>
<!--Put data-toggle and data-target on li element to clear menu on click-->
<li data-toggle="collapse" data-target=".navbar-collapse.in">
<a routerLink="timetable" class="waves-effect active" >
<i data-icon="" class="linea-icon linea-basic fa-fw "></i>
<span class="hide-menu">Generate TimeTable</span>
<li>

<!--<a routerLink="timetable" class="waves-effect active" >-->
<!--<i data-icon="" class="linea-icon linea-basic fa fa-magic "></i>-->
<!--<span class="hide-menu">Generate TimeTable</span>-->
<!--</a>-->
<a class="waves-effect dropdown-toggle" data-toggle="collapse" data-target="timeTableSubMenu" aria-expanded="false">
<i data-icon="R" class="linea-icon linea-software fa-fw"></i>
<span class="hide-menu">TimeTable<span class="fa arrow"></span></span>
</a>
<ul id="timeTableSubMenu" role="menu" class="nav collapse">
<!--Put data-toggle and data-target on li element to clear menu on click-->
<li data-toggle="collapse" data-target=".navbar-collapse.in">
<a routerLink="timetable-generation" class="waves-effect">Generate TimeTable</a>
</li>
<!--Put data-toggle and data-target on li element to clear menu on click-->
<li data-toggle="collapse" data-target=".navbar-collapse.in">
<a routerLink="timetable-mgmt" class="waves-effect">Manage Generated TimeTables.</a>
</li>
</ul>
</li>
</ul>
</div>
Expand Down
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<p>
time-table-mgmt works!
</p>
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/* tslint:disable:no-unused-variable */
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { DebugElement } from '@angular/core';

import { TimeTableMgmtComponent } from './time-table-mgmt.component';

describe('TimeTableMgmtComponent', () => {
let component: TimeTableMgmtComponent;
let fixture: ComponentFixture<TimeTableMgmtComponent>;

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ TimeTableMgmtComponent ]
})
.compileComponents();
}));

beforeEach(() => {
fixture = TestBed.createComponent(TimeTableMgmtComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { Component, OnInit } from '@angular/core';

@Component({
selector: 'app-time-table-mgmt',
templateUrl: './time-table-mgmt.component.html',
styleUrls: ['./time-table-mgmt.component.css']
})
export class TimeTableMgmtComponent implements OnInit {

constructor() { }

ngOnInit() {
}

}

0 comments on commit 6e3d4a1

Please sign in to comment.