diff --git a/TeachingAssistantUltimate/ClientApp/Services/students.service.ts b/TeachingAssistantUltimate/ClientApp/Services/students.service.ts new file mode 100644 index 0000000..beac30d --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/Services/students.service.ts @@ -0,0 +1,17 @@ +import { Injectable } from '@angular/core'; +import { IStudents } from '../app/model/IStudents'; + +@Injectable() +export class StudentsService { + private stds!: IStudents[]; + constructor() { + } + + get():IStudents[] { + return this.stds; + } + + set(stds: IStudents[]) { + this.stds = stds; + } +} \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/app.shared.module.ts b/TeachingAssistantUltimate/ClientApp/app/app.shared.module.ts index c179e4a..52cf2a1 100644 --- a/TeachingAssistantUltimate/ClientApp/app/app.shared.module.ts +++ b/TeachingAssistantUltimate/ClientApp/app/app.shared.module.ts @@ -23,6 +23,26 @@ import { QuillEditorModule } from './Editor'; import { TopicsResolver } from './resolvers/TopicsResolver'; import { HttpClientModule } from '@angular/common/http'; import { PrintProviderService } from './providers/print-provider.service'; +import { AssTypesComponent } from './components/ass-types/ass-types.component'; +import { AssTypesResolver } from './resolvers/AssTypesResolver'; +import { EditAssTypeComponent } from './components/edit-ass-type/edit-ass-type.component'; +import { AssTypeResolver } from './resolvers/AssTypeResolver'; +import { ClassesComponent } from './components/classes/classes.component'; +import { ClassessHttpProvider } from './providers/classes-http-provider'; +import { AssessTypeHttpProvider } from './providers/ass-types-http-provider'; +import { ClassesResolver } from './resolvers/ClassesResolver'; +import { PreviewStudentsComponent } from './components/preview-students/preview-students.component'; +import { StudentsService } from '../Services/students.service'; +import { StudentsHttpProvider } from './providers/students-http-provider'; +import { ClassResolver } from './resolvers/ClassResolver'; +import { AddResultsComponent } from './components/add-results/add-results.component'; +import { StudentsResolver } from './resolvers/StudentsResolver'; +import { ResultsHttpProvider } from './providers/results-http-provider'; +import { ClassSubjectsResolver } from './resolvers/ClassSubjectsResolver'; +import { ViwResultsComponent } from './components/viw-results/viw-results.component'; +import { SmartEntryComponent } from './components/smart-entry/smart-entry.component'; +import { TagResultsComponent } from './components/tag-results/tag-results.component'; +import { TagsResolver } from './resolvers/TagsResolver'; @NgModule({ declarations: [ @@ -34,9 +54,36 @@ import { PrintProviderService } from './providers/print-provider.service'; EditSubjectComponent, GeneratorComponent, QuestionsComponent, - ViewQuestionComponent + ViewQuestionComponent, + AssTypesComponent, + EditAssTypeComponent, + ClassesComponent, + PreviewStudentsComponent, + AddResultsComponent, + ViwResultsComponent, + SmartEntryComponent, + TagResultsComponent + ], + providers: [ + HttpProvider, + AssessTypeHttpProvider, + HttpHandler, + SubjectsResolver, + SubjectResolver, + TopicsResolver, + PrintProviderService, + AssTypesResolver, + AssTypeResolver, + ClassessHttpProvider, + ClassesResolver, + StudentsService, + StudentsHttpProvider, + ClassResolver, + StudentsResolver, + ResultsHttpProvider, + ClassSubjectsResolver, + TagsResolver ], - providers: [HttpProvider, HttpHandler, SubjectsResolver, SubjectResolver, TopicsResolver, PrintProviderService], exports: [RouterModule], imports: [ CommonModule, @@ -51,6 +98,14 @@ import { PrintProviderService } from './providers/print-provider.service'; { path: 'edit-subject/:id', component: EditSubjectComponent, resolve: { subject: SubjectResolver } }, { path: 'add-question/:id', component: QuestionsComponent, resolve: { subject: SubjectResolver } }, { path: 'generate/:id', component: GeneratorComponent, resolve: { subject: SubjectResolver, topics: TopicsResolver } }, + { path: 'types', component: AssTypesComponent, resolve: { types: AssTypesResolver } }, + { path: 'edit-type/:id', component: EditAssTypeComponent, resolve: { type: AssTypeResolver } }, + { path: 'classes', component: ClassesComponent, resolve: { classes: ClassesResolver } }, + { path: 'preview-students/:id', component: PreviewStudentsComponent, resolve: { "class": ClassResolver } }, + { path: 'add-results/:id', component: AddResultsComponent, resolve: { "class": ClassResolver, 'students': StudentsResolver, 'types': AssTypesResolver, 'subjects': SubjectsResolver } }, + { path: 'smart-entry/:id', component: SmartEntryComponent, resolve: { "class": ClassResolver, 'students': StudentsResolver, 'types': AssTypesResolver, 'subjects': SubjectsResolver } }, + { path: 'view-results/:id', component: ViwResultsComponent, resolve: { "class": ClassResolver, 'subjects': ClassSubjectsResolver } }, + { path: 'tag-results/:id', component: TagResultsComponent, resolve: { "class": ClassResolver, 'subjects': ClassSubjectsResolver, 'tags': TagsResolver, 'types': AssTypesResolver } }, { path: '**', redirectTo: 'home' } ]) ] diff --git a/TeachingAssistantUltimate/ClientApp/app/assets/imgs/Ex Ass.png b/TeachingAssistantUltimate/ClientApp/app/assets/imgs/Ex Ass.png new file mode 100644 index 0000000..1e9d7b5 Binary files /dev/null and b/TeachingAssistantUltimate/ClientApp/app/assets/imgs/Ex Ass.png differ diff --git a/TeachingAssistantUltimate/ClientApp/app/assets/imgs/Teaching Assistant Banner.png b/TeachingAssistantUltimate/ClientApp/app/assets/imgs/Teaching Assistant Banner.png new file mode 100644 index 0000000..764f3e7 Binary files /dev/null and b/TeachingAssistantUltimate/ClientApp/app/assets/imgs/Teaching Assistant Banner.png differ diff --git a/TeachingAssistantUltimate/ClientApp/app/assets/imgs/bStudio.png b/TeachingAssistantUltimate/ClientApp/app/assets/imgs/bStudio.png new file mode 100644 index 0000000..611415a Binary files /dev/null and b/TeachingAssistantUltimate/ClientApp/app/assets/imgs/bStudio.png differ diff --git a/TeachingAssistantUltimate/ClientApp/app/components/about/about.component.css b/TeachingAssistantUltimate/ClientApp/app/components/about/about.component.css new file mode 100644 index 0000000..e02abfc --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/about/about.component.css @@ -0,0 +1 @@ + diff --git a/TeachingAssistantUltimate/ClientApp/app/components/about/about.component.html b/TeachingAssistantUltimate/ClientApp/app/components/about/about.component.html new file mode 100644 index 0000000..f634e83 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/about/about.component.html @@ -0,0 +1,60 @@ +
+
+
+
+

Setting up

+

The database is first created when the application first launches and subsequently recreated if the database is missing. There is no need to do anything thereof

+

+ Add the Subjects and the Classes you teach +

+

Once the above steps are done, you are more than ready to explore the application in full

+
+
+

Adding students

+

Upload the list of students with an excel file. Simple as that . However a pattern must be observed to create the understanding between you and the software

+
    +
  • Uploading students data instructions
    • +
  • Have an excel sheets that contains the list of students
    • +
  • There must be no header of any sort. They will be included as students. Do not provide a header
    • +
  • The system reads all cells for which it can read data in the cell from columns A and B. All other columns will be ignored
    • +
  • To make life easier for yourself and the system, follow the instructions given
    • +
+
+
+
+
+
+
+

Managing the classes

+

When adding classes, you need to supply some parameter which will be used later by the application to help you do things easily

+
+
Class Name
+
The name of the class as know in your school or institution. The user interface will tell you on the valid values
+
Prefix
+
The prefix is all the characters that precede the actual number of the student. E.g. "MS/2019/045" where "MS/2019/" is the prefix for all students in that class and the 045 is the actual number of the student. You would therefore store the "MS/2019/" as the prefix for all students in that class.
+
+

+ The padding is the number of zeros that precede the actual number. While the developer does not personally find that behavior useful, it is a common practice. Depending on the estimated number of students, some institution pad the numbers of the students with zeros as in the example given above. The number of the student was given as 045; a padding of 1. This can be inferred that if the number ranged between 1 and 9, two zeros would have been padded to the left of the number. The user is expected to provide the padding that is used in the institution where he/she works. Default is 0, meaning no padding +

+
+
+
+
+
+
+

Adding results

+

From the classes page, you will have two options "Add results" button and "Smart Entry"

+
+
+

Add Results

+

This give the old familiar excel interface to add your results. The names and index number of the students in the class are generated and text boxes for the score added. The list is generated orderly for entry. Validation rules are enforced before saving the data is allowed.

+

This is suitable for small number of students or when the index number of the students do not follow a particular patter

+
+
+

Smart Entry

+

Based on the number part, the index number of the student can be inferred and used to enter the score. The user simply provides the number part, say 45, and the program will infer that, it should pad two zeros and attach the prefix of the class. Should the number match a valid student, the results are added, else you will be prompted to correct the anomaly

+

Smart entry is faster when processing large numbers of students where most of them have a predictable index number. In those occasions where some of the students do not have the class pattern, the full index number should be provided and there would be no smart inference

+
+
+
+
\ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/components/about/about.component.spec.ts b/TeachingAssistantUltimate/ClientApp/app/components/about/about.component.spec.ts new file mode 100644 index 0000000..904eaf3 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/about/about.component.spec.ts @@ -0,0 +1,25 @@ +/// +import { TestBed, async, ComponentFixture, ComponentFixtureAutoDetect } from '@angular/core/testing'; +import { BrowserModule, By } from "@angular/platform-browser"; +import { AboutComponent } from './about.component'; + +let component: AboutComponent; +let fixture: ComponentFixture; + +describe('about component', () => { + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ AboutComponent ], + imports: [ BrowserModule ], + providers: [ + { provide: ComponentFixtureAutoDetect, useValue: true } + ] + }); + fixture = TestBed.createComponent(AboutComponent); + component = fixture.componentInstance; + })); + + it('should do something', async(() => { + expect(true).toEqual(true); + })); +}); \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/components/about/about.component.ts b/TeachingAssistantUltimate/ClientApp/app/components/about/about.component.ts new file mode 100644 index 0000000..db0b2c4 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/about/about.component.ts @@ -0,0 +1,14 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'bs-about', + templateUrl: './about.component.html', + styleUrls: ['./about.component.css'] +}) +/** about component*/ +export class AboutComponent { + /** about ctor */ + constructor() { + + } +} \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/components/add-results/add-results.component.css b/TeachingAssistantUltimate/ClientApp/app/components/add-results/add-results.component.css new file mode 100644 index 0000000..e02abfc --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/add-results/add-results.component.css @@ -0,0 +1 @@ + diff --git a/TeachingAssistantUltimate/ClientApp/app/components/add-results/add-results.component.html b/TeachingAssistantUltimate/ClientApp/app/components/add-results/add-results.component.html new file mode 100644 index 0000000..3d8edcb --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/add-results/add-results.component.html @@ -0,0 +1,105 @@ +Add results +

Add student results

+
+
Class
+
{{_class.className}}
+
Prefix
+
{{_class.indexPrefix}}
+
+
+
+ Select the initial data +
+ +
+ +
+ The maximum length is {{form.controls.subjectsID.errors.max.max}} characters: Current is {{form.controls.subjectsID.errors.max.max}} + Enter subjectsID + The minimum length is {{form.controls.subjectsID.errors.min.min}} characters: Current is {{form.controls.subjectsID.errors.min.min}} +
+
+ +
+ +
+ The maximum length is {{form.controls.tag.errors.maxlength.requiredLength}} characters: Current is {{form.controls.tag.errors.maxlength.actualLength}} + Enter tag + The minimum length is {{form.controls.tag.errors.minlength.requiredLength}} characters: Current is {{form.controls.tag.errors.minlength.actualLength}} +
+
+ +
+ +
+ The maximum length is {{form.controls.assessmentTypesID.errors.max.max}} characters: Current is {{form.controls.assessmentTypesID.errors.max.max}} + Select assessment type + The minimum length is {{form.controls.assessmentTypesID.errors.min.min}} characters: Current is {{form.controls.assessmentTypesID.errors.min.min}} +
+
+ +
+ +
+ The maximum {{form.controls.max.errors.max.max}} + Enter maximum score + The minimum length is {{form.controls.max.errors.min.min}} characters: Current is {{form.controls.max.errors.min.min}} +
+
+
+
+ +
+
ID
+
Index Number
+
Name
+
Score
+
+
+
+ +
+
+ +
+
+ +
+
+ + The maximum {{f.controls.score.errors.max.max}} + Enter score + The minimum is {{f.controls.score.errors.min.min}} +
+
+
+
+
+
+ +
\ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/components/add-results/add-results.component.spec.ts b/TeachingAssistantUltimate/ClientApp/app/components/add-results/add-results.component.spec.ts new file mode 100644 index 0000000..d9e5545 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/add-results/add-results.component.spec.ts @@ -0,0 +1,25 @@ +/// +import { TestBed, async, ComponentFixture, ComponentFixtureAutoDetect } from '@angular/core/testing'; +import { BrowserModule, By } from "@angular/platform-browser"; +import { AddResultsComponent } from './add-results.component'; + +let component: AddResultsComponent; +let fixture: ComponentFixture; + +describe('add-results component', () => { + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ AddResultsComponent ], + imports: [ BrowserModule ], + providers: [ + { provide: ComponentFixtureAutoDetect, useValue: true } + ] + }); + fixture = TestBed.createComponent(AddResultsComponent); + component = fixture.componentInstance; + })); + + it('should do something', async(() => { + expect(true).toEqual(true); + })); +}); \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/components/add-results/add-results.component.ts b/TeachingAssistantUltimate/ClientApp/app/components/add-results/add-results.component.ts new file mode 100644 index 0000000..64f96b7 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/add-results/add-results.component.ts @@ -0,0 +1,79 @@ +import { Component } from '@angular/core'; +import { IStudents } from '../../model/IStudents'; +import { IClasses } from '../../model/IClasses'; +import { StudentsService } from '../../../Services/students.service'; +import { StudentsHttpProvider } from '../../providers/students-http-provider'; +import { HttpErrorResponse } from '@angular/common/http'; +import { Router, ActivatedRoute } from '@angular/router'; +import { HttpHandler } from '../../providers/HttpHandler'; +import { ISubjects } from '../../model/ISubjects'; +import { IAssTypes } from '../../model/IAssTypes'; +import { FormGroup, FormBuilder, Validators } from '@angular/forms'; +import { IResults } from '../../model/IResults'; +import { ResultsHttpProvider } from '../../providers/results-http-provider'; +import { IResultsDisplay } from '../../model/IResultsDisplay'; + +@Component({ + selector: 'bs-add-results', + templateUrl: './add-results.component.html', + styleUrls: ['./add-results.component.css'] +}) +/** add-results component*/ +export class AddResultsComponent { + students: IStudents[]; + _class: IClasses; + subjects: ISubjects[]; + types: IAssTypes[]; + form: FormGroup; + res_form: FormGroup[]; + max: number = 20; + status: boolean = true; + constructor(stds: StudentsService, private http: ResultsHttpProvider, private hand: HttpHandler, private router: Router, route: ActivatedRoute) { + this.students = route.snapshot.data["students"]; + this._class = route.snapshot.data["class"]; + this.subjects = route.snapshot.data["subjects"]; + this.types = route.snapshot.data["types"]; + this.res_form = this.initResForm(new FormBuilder()); + this.form = this.initForm(new FormBuilder()); + } + + initForm(fb: FormBuilder): FormGroup { + return fb.group({ + subjectsID: ['', Validators.compose([Validators.required])], + assessmentTypesID: ['', Validators.compose([Validators.required])], + tag: ["", Validators.compose([Validators.required, Validators.minLength(3), Validators.maxLength(20)])], + max: [this.max, Validators.compose([Validators.required, Validators.max(100), Validators.min(5)])] + }); + } + + initResForm(fb: FormBuilder): FormGroup[] { + let form: FormGroup[] = []; + this.students.forEach(x => { + form.push(fb.group({ + score: [0, Validators.compose([Validators.required, Validators.min(0), Validators.max(this.max)])], + name: [x.name], + indexNumber: [x.indexNumber], + studentsID: [x.studentsID] + })) + }); + return form; + } + save(fm: FormGroup, fgs: FormGroup[]) { + let res: IResults[] = []; + fgs.forEach(x => res.push({ + assessmentTypesID: fm.value["assessmentTypesID"], + score: x.value["score"], + studentsID: x.value["studentsID"], + subjectsID: fm.value["subjectsID"], + totalScore: fm.value["max"], + tag:fm.value['tag'] + } as IResults)); + this.http.add(res).subscribe((res: IResultsDisplay[]) => { + this.router.navigate(['/classes']); + }, (err: HttpErrorResponse) => this.hand.handleError(err)); + } + + form_valid(): boolean { + return this.form.valid && this.res_form.every(x => x.valid); + } +} \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/components/ass-types/ass-types.component.css b/TeachingAssistantUltimate/ClientApp/app/components/ass-types/ass-types.component.css new file mode 100644 index 0000000..e02abfc --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/ass-types/ass-types.component.css @@ -0,0 +1 @@ + diff --git a/TeachingAssistantUltimate/ClientApp/app/components/ass-types/ass-types.component.html b/TeachingAssistantUltimate/ClientApp/app/components/ass-types/ass-types.component.html new file mode 100644 index 0000000..4f1a5a8 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/ass-types/ass-types.component.html @@ -0,0 +1,65 @@ +Assessment Types +

Assessment Types

+
+

Assessment types refers to the types of assessment that are organized for students e.g. quiz, midsem etc. If your school does not have an exam processing you, you can add exam as an assessment type in order to compile the final score sheet for you

+
+
+
+ Add a new subject +
+ +
+ +
+ The maximum length is {{form.controls.assessmentType.errors.maxlength.requiredLength}} characters: Current is {{form.controls.assessmentType.errors.maxlength.actualLength}} + Enter assessmentType + The minimum length is {{form.controls.assessmentType.errors.minlength.requiredLength}} characters: Current is {{form.controls.assessmentType.errors.minlength.actualLength}} +
+
+ +
+ +
+ The maximum allowed is {{form.controls.total.errors.max.max}} + Enter total + The minimum value allowed is {{form.controls.total.errors.min.min}} +
+
+ +
+
{{hand.message}}
+
+
+ + + + + + + + + + + + + + + + + + +
TypeTotalEditDelete
{{t.assessmentType}}{{t.total}} + + + +
\ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/components/ass-types/ass-types.component.spec.ts b/TeachingAssistantUltimate/ClientApp/app/components/ass-types/ass-types.component.spec.ts new file mode 100644 index 0000000..163f05b --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/ass-types/ass-types.component.spec.ts @@ -0,0 +1,25 @@ +/// +import { TestBed, async, ComponentFixture, ComponentFixtureAutoDetect } from '@angular/core/testing'; +import { BrowserModule, By } from "@angular/platform-browser"; +import { AssTypesComponent } from './ass-types.component'; + +let component: AssTypesComponent; +let fixture: ComponentFixture; + +describe('ass-types component', () => { + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ AssTypesComponent ], + imports: [ BrowserModule ], + providers: [ + { provide: ComponentFixtureAutoDetect, useValue: true } + ] + }); + fixture = TestBed.createComponent(AssTypesComponent); + component = fixture.componentInstance; + })); + + it('should do something', async(() => { + expect(true).toEqual(true); + })); +}); \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/components/ass-types/ass-types.component.ts b/TeachingAssistantUltimate/ClientApp/app/components/ass-types/ass-types.component.ts new file mode 100644 index 0000000..2c8327a --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/ass-types/ass-types.component.ts @@ -0,0 +1,60 @@ +import { Component } from '@angular/core'; +import { IAssTypes } from '../../model/IAssTypes'; +import { FormGroup, FormBuilder, Validators } from '@angular/forms'; +import { ActivatedRoute } from '@angular/router'; +import { HttpErrorResponse } from '@angular/common/http'; +import { HttpHandler } from '../../providers/HttpHandler'; +import { AssessTypeHttpProvider } from '../../providers/ass-types-http-provider'; + +@Component({ + selector: 'bs-ass-types', + templateUrl: './ass-types.component.html', + styleUrls: ['./ass-types.component.css'] +}) +/** ass-types component*/ +export class AssTypesComponent { + types: IAssTypes[]; + form: FormGroup; + constructor(private route: ActivatedRoute, fb: FormBuilder, private htpp: AssessTypeHttpProvider, public hand: HttpHandler) { + this.form = this.InitForm(fb); + this.types = this.route.snapshot.data["types"] as IAssTypes[]; + } + + + InitForm(fb: FormBuilder): FormGroup { + return fb.group({ + assessmentType: ["", Validators.compose([Validators.required, Validators.minLength(3), Validators.maxLength(20)])], + total: ["", Validators.compose([Validators.required, Validators.min(5), Validators.max(70)])] + }) + } + + add(sub: IAssTypes) { + this.hand.processing = true; + this.hand.error = false; + this.htpp.addAssTypes(sub).subscribe((res:IAssTypes) => { + this.types.unshift(res); + this.hand.message = `${res.assessmentType} was added successfully`; + this.form = this.InitForm(new FormBuilder()); + }, (err: HttpErrorResponse) => { + this.hand.handleError(err); + }); + this.hand.processing = false; + } + + delete(ass: IAssTypes) { + if (confirm(`Are you sure you want to delete ${ass.assessmentType} from the list?`)) { + this.hand.processing = true; + this.hand.error = false; + this.hand.message = ""; + this.htpp.deleteAssTypes(ass).subscribe(res => { + this.hand.error = false; + let ix: number = this.types.findIndex(q => q.assessmentTypesID === ass.assessmentTypesID); + this.types.splice(ix, 1); + this.hand.message = `${ass.assessmentType} was deleted`; + }, ((err: HttpErrorResponse) => { + this.hand.handleError(err); + })); + this.hand.processing = false; + } + } +} \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/components/classes/classes.component.css b/TeachingAssistantUltimate/ClientApp/app/components/classes/classes.component.css new file mode 100644 index 0000000..e02abfc --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/classes/classes.component.css @@ -0,0 +1 @@ + diff --git a/TeachingAssistantUltimate/ClientApp/app/components/classes/classes.component.html b/TeachingAssistantUltimate/ClientApp/app/components/classes/classes.component.html new file mode 100644 index 0000000..8d860af --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/classes/classes.component.html @@ -0,0 +1,100 @@ +Classes +

Classes

+
+
+ Add a new class +
+ +
+ +
+ The maximum length is {{form.controls.className.errors.maxlength.requiredLength}} characters: Current is {{form.controls.className.errors.maxlength.actualLength}} + Enter class name + The minimum length is {{form.controls.className.errors.minlength.requiredLength}} characters: Current is {{form.controls.className.errors.minlength.actualLength}} +
+
+ +
+ +
+ The maximum length is {{form.controls.indexPrefix.errors.maxlength.requiredLength}} characters: Current is {{form.controls.indexPrefix.errors.maxlength.actualLength}} + Enter index number prefix + The minimum length is {{form.controls.indexPrefix.errors.minlength.requiredLength}} characters: Current is {{form.controls.indexPrefix.errors.minlength.actualLength}} +
+
+ +
+ +
+ The maximum is {{form.controls.padding.errors.max.max}} + Enter index number prefix + The minimum length is {{form.controls.padding.errors.min.min}} +
+
+ +
+
{{hand.message}}
+
+
+ +

Your saved subjects

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ClassPrefixPaddingStudentsUpload Excel FileAdd singleAdd ResultsEditDelete
{{c.className}}{{c.indexPrefix}}{{c.padding}}{{c.count}} + + + + + + + + + + + + + +
diff --git a/TeachingAssistantUltimate/ClientApp/app/components/classes/classes.component.spec.ts b/TeachingAssistantUltimate/ClientApp/app/components/classes/classes.component.spec.ts new file mode 100644 index 0000000..e2fc28a --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/classes/classes.component.spec.ts @@ -0,0 +1,25 @@ +/// +import { TestBed, async, ComponentFixture, ComponentFixtureAutoDetect } from '@angular/core/testing'; +import { BrowserModule, By } from "@angular/platform-browser"; +import { ClassesComponent } from './classes.component'; + +let component: ClassesComponent; +let fixture: ComponentFixture; + +describe('classes component', () => { + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ClassesComponent ], + imports: [ BrowserModule ], + providers: [ + { provide: ComponentFixtureAutoDetect, useValue: true } + ] + }); + fixture = TestBed.createComponent(ClassesComponent); + component = fixture.componentInstance; + })); + + it('should do something', async(() => { + expect(true).toEqual(true); + })); +}); \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/components/classes/classes.component.ts b/TeachingAssistantUltimate/ClientApp/app/components/classes/classes.component.ts new file mode 100644 index 0000000..d56bd43 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/classes/classes.component.ts @@ -0,0 +1,93 @@ +import { Component, OnInit } from '@angular/core'; +import { FormGroup, FormBuilder, Validators } from '@angular/forms'; +import { HttpHandler } from '../../providers/HttpHandler'; +import { ActivatedRoute, Router } from '@angular/router'; +import { HttpErrorResponse } from '@angular/common/http'; +import { IClasses } from '../../model/IClasses'; +import { ClassessHttpProvider } from '../../providers/classes-http-provider'; +import * as XLSX from 'xlsx'; +import { IStudents } from '../../model/IStudents'; +import { StudentsService } from '../../../Services/students.service'; + +@Component({ + selector: 'bs-classes', + templateUrl: './classes.component.html', + styleUrls: ['./classes.component.css'] +}) +/** classes component*/ +export class ClassesComponent { + data: Array> = []; + form: FormGroup; + classes: IClasses[]; + ngOnInit(): void { + + } + constructor(private route: ActivatedRoute, fb: FormBuilder, private htpp: ClassessHttpProvider, public hand: HttpHandler, private router: Router, private stds_serv: StudentsService) { + this.form = this.InitForm(fb); + this.classes = this.route.snapshot.data["classes"] as IClasses[]; + } + + + InitForm(fb: FormBuilder): FormGroup { + return fb.group({ + className: ["", Validators.compose([Validators.required, Validators.minLength(3), Validators.maxLength(10)])], + indexPrefix: ["", Validators.compose([Validators.required, Validators.minLength(3), Validators.maxLength(20)])], + padding:[0,Validators.compose([Validators.required, Validators.min(0), Validators.max(5)])] + }) + } + + add(cl: IClasses) { + this.hand.processing = true; + this.hand.error = false; + this.htpp.add(cl).subscribe(res => { + this.classes.unshift(res); + this.hand.message = `${cl.className} was added successfully`; + this.form = this.InitForm(new FormBuilder()); + }, (err: HttpErrorResponse) => { + this.hand.handleError(err); + }); + this.hand.processing = false; + } + + delete(cl: IClasses) { + if (confirm(`Are you sure you want to delete ${cl.className} from the list?`)) { + this.hand.processing = true; + this.hand.error = false; + this.hand.message = ""; + this.htpp.delete(cl).subscribe(res => { + this.hand.error = false; + let ix: number = this.classes.findIndex(q => q.classesID === cl.classesID); + this.classes.splice(ix, 1); + this.hand.message = `${cl.className} was deleted`; + }, ((err: HttpErrorResponse) => { + this.hand.handleError(err); + })); + this.hand.processing = false; + } + } + + onFileChange(evt: any, c: IClasses) { + /* wire up file reader */ + const target: DataTransfer = (evt.target); + if (target.files.length !== 1) throw new Error('Cannot use multiple files'); + const reader: FileReader = new FileReader(); + reader.onload = (e: any) => { + /* read workbook */ + const bstr: string = e.target.result; + const wb: XLSX.WorkBook = XLSX.read(bstr, { type: 'binary' }); + + /* grab first sheet */ + const wsname: string = wb.SheetNames[0]; + const ws: XLSX.WorkSheet = wb.Sheets[wsname]; + /* save data */ + this.data = (XLSX.utils.sheet_to_json(ws, { header: 1 })); + let stds: IStudents[] = []; + this.data.forEach(x => stds.push({ + classesID: c.classesID, indexNumber: x[1], name: x[0] + } as IStudents)); + this.stds_serv.set(stds); + this.router.navigate(['/preview-students', c.classesID]); + }; + reader.readAsBinaryString(target.files[0]); + } +} \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/components/edit-ass-type/edit-ass-type.component.css b/TeachingAssistantUltimate/ClientApp/app/components/edit-ass-type/edit-ass-type.component.css new file mode 100644 index 0000000..e02abfc --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/edit-ass-type/edit-ass-type.component.css @@ -0,0 +1 @@ + diff --git a/TeachingAssistantUltimate/ClientApp/app/components/edit-ass-type/edit-ass-type.component.html b/TeachingAssistantUltimate/ClientApp/app/components/edit-ass-type/edit-ass-type.component.html new file mode 100644 index 0000000..a24ca3b --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/edit-ass-type/edit-ass-type.component.html @@ -0,0 +1,41 @@ +Edit {{type.assessmentType}} +

Edit {{type.assessmentType}}

+
+
+ Make your changes as appropriate +
+ +
+ +
+ The maximum length is {{form.controls.assessmentType.errors.maxlength.requiredLength}} characters: Current is {{form.controls.assessmentType.errors.maxlength.actualLength}} + Enter assessmentType + The minimum length is {{form.controls.assessmentType.errors.minlength.requiredLength}} characters: Current is {{form.controls.assessmentType.errors.minlength.actualLength}} +
+
+ +
+ +
+ The maximum allowed is {{form.controls.total.errors.max.max}} + Enter total + The minimum value allowed is {{form.controls.total.errors.min.min}} +
+
+ + +
+
{{hand.message}}
+ +
+
\ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/components/edit-ass-type/edit-ass-type.component.spec.ts b/TeachingAssistantUltimate/ClientApp/app/components/edit-ass-type/edit-ass-type.component.spec.ts new file mode 100644 index 0000000..43d2026 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/edit-ass-type/edit-ass-type.component.spec.ts @@ -0,0 +1,25 @@ +/// +import { TestBed, async, ComponentFixture, ComponentFixtureAutoDetect } from '@angular/core/testing'; +import { BrowserModule, By } from "@angular/platform-browser"; +import { EditAssTypeComponent } from './edit-ass-type.component'; + +let component: EditAssTypeComponent; +let fixture: ComponentFixture; + +describe('edit-ass-type component', () => { + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ EditAssTypeComponent ], + imports: [ BrowserModule ], + providers: [ + { provide: ComponentFixtureAutoDetect, useValue: true } + ] + }); + fixture = TestBed.createComponent(EditAssTypeComponent); + component = fixture.componentInstance; + })); + + it('should do something', async(() => { + expect(true).toEqual(true); + })); +}); \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/components/edit-ass-type/edit-ass-type.component.ts b/TeachingAssistantUltimate/ClientApp/app/components/edit-ass-type/edit-ass-type.component.ts new file mode 100644 index 0000000..e2baf57 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/edit-ass-type/edit-ass-type.component.ts @@ -0,0 +1,64 @@ +import { Component } from '@angular/core'; +import { IAssTypes } from '../../model/IAssTypes'; +import { FormGroup, FormBuilder, Validators } from '@angular/forms'; +import { ActivatedRoute, Router } from '@angular/router'; +import { HttpErrorResponse } from '@angular/common/http'; +import { HttpHandler } from '../../providers/HttpHandler'; +import { AssessTypeHttpProvider } from '../../providers/ass-types-http-provider'; + +@Component({ + selector: 'bs-edit-ass-type', + templateUrl: './edit-ass-type.component.html', + styleUrls: ['./edit-ass-type.component.css'] +}) +/** edit-ass-type component*/ +export class EditAssTypeComponent { + type: IAssTypes; + form: FormGroup; + constructor(private route: ActivatedRoute, private router: Router, fb: FormBuilder, private htpp: AssessTypeHttpProvider, public hand: HttpHandler) { + this.type = this.route.snapshot.data["type"] as IAssTypes; + this.form = this.InitForm(fb); + } + + InitForm(fb: FormBuilder): FormGroup { + return fb.group({ + assessmentType: [this.type.assessmentType, Validators.compose([Validators.required, Validators.minLength(3), Validators.maxLength(20)])], + total: [this.type.total, Validators.compose([Validators.required, Validators.min(5), Validators.max(70)])] + }) + } + + edit(sub: IAssTypes) { + this.hand.processing = true; + this.hand.error = false; + if (this.type.assessmentType === sub.assessmentType && this.type.total === sub.total) { + alert("Nothing has changed. Operation was aborted"); + } + else { + this.type.assessmentType = sub.assessmentType; + this.type.total == sub.total; + this.htpp.editAssTypes(this.type).subscribe((res: IAssTypes) => { + this.hand.message = `${res.assessmentType} was edited successfully`; + this.router.navigate(['/types']) + }, (err: HttpErrorResponse) => { + this.hand.handleError(err); + }); + } + this.hand.processing = false; + } + + delete() { + if (confirm(`Are you sure you want to delete ${this.type.assessmentType} from the list?`)) { + this.hand.processing = true; + this.hand.error = false; + this.hand.message = ""; + this.htpp.deleteAssTypes(this.type).subscribe(res => { + this.hand.error = false; + this.hand.message = `${this.type.assessmentType} was deleted`; + this.router.navigate(['/types']) + }, ((err: HttpErrorResponse) => { + this.hand.handleError(err); + })); + this.hand.processing = false; + } + } +} \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/components/generator/generator.component.html b/TeachingAssistantUltimate/ClientApp/app/components/generator/generator.component.html index 617b932..d00036c 100644 --- a/TeachingAssistantUltimate/ClientApp/app/components/generator/generator.component.html +++ b/TeachingAssistantUltimate/ClientApp/app/components/generator/generator.component.html @@ -15,26 +15,6 @@ - @@ -62,7 +42,6 @@
Set number of questions to fetch from each topic
-
Header diff --git a/TeachingAssistantUltimate/ClientApp/app/components/generator/generator.component.ts b/TeachingAssistantUltimate/ClientApp/app/components/generator/generator.component.ts index 1b5d646..e3efc18 100644 --- a/TeachingAssistantUltimate/ClientApp/app/components/generator/generator.component.ts +++ b/TeachingAssistantUltimate/ClientApp/app/components/generator/generator.component.ts @@ -45,8 +45,4 @@ export class GeneratorComponent { print(head: string): void { this.printer.print(head); } - - serverPrint() { - this.http.print(parseInt(this.route.snapshot.paramMap.get('id') as string)).subscribe(res => console.log(res)); - } } \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/components/home/home.component.html b/TeachingAssistantUltimate/ClientApp/app/components/home/home.component.html index dcdc6f9..8d00ef1 100644 --- a/TeachingAssistantUltimate/ClientApp/app/components/home/home.component.html +++ b/TeachingAssistantUltimate/ClientApp/app/components/home/home.component.html @@ -1,16 +1,39 @@ -

Hello, world!

-

Welcome to your new single-page application, built with:

- -

To help you get started, we've also set up:

-
    -
  • Client-side navigation. For example, click Counter then Back to return here.
    • -
  • Server-side prerendering. For faster initial loading and improved SEO, your Angular app is prerendered on the server. The resulting HTML is then transferred to the browser where a client-side copy of the app takes over.
    • -
  • Webpack dev middleware. In development mode, there's no need to run the webpack build tool. Your client-side resources are dynamically built on demand. Updates are available as soon as you modify any file.
    • -
  • Hot module replacement. In development mode, you don't even need to reload the page after making most changes. Within seconds of saving changes to files, your Angular app will be rebuilt and a new instance injected into the page.
    • -
  • Efficient production builds. In production mode, development-time features are disabled, and the webpack build tool produces minified static CSS and JavaScript files.
    • -
+Home Page + +

Welcome to bStudio Teaching Assistant Ultimate

+ \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/components/navmenu/navmenu.component.html b/TeachingAssistantUltimate/ClientApp/app/components/navmenu/navmenu.component.html index aa30acf..149a1cf 100644 --- a/TeachingAssistantUltimate/ClientApp/app/components/navmenu/navmenu.component.html +++ b/TeachingAssistantUltimate/ClientApp/app/components/navmenu/navmenu.component.html @@ -1,3 +1,4 @@ +
@@ -7,21 +8,26 @@ - Teaching Assistant + Teaching Assistant
diff --git a/TeachingAssistantUltimate/ClientApp/app/components/preview-students/preview-students.component.css b/TeachingAssistantUltimate/ClientApp/app/components/preview-students/preview-students.component.css new file mode 100644 index 0000000..e02abfc --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/preview-students/preview-students.component.css @@ -0,0 +1 @@ + diff --git a/TeachingAssistantUltimate/ClientApp/app/components/preview-students/preview-students.component.html b/TeachingAssistantUltimate/ClientApp/app/components/preview-students/preview-students.component.html new file mode 100644 index 0000000..5b127d1 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/preview-students/preview-students.component.html @@ -0,0 +1,27 @@ +Preview student +

Preview the list of students before saving

+
+
Class
+
{{_class.className}}
+
Prefix
+
{{_class.indexPrefix}}
+
+ +
+ + +
+ + + + + + + + + + + + + +
NameIndex Number
{{s.name}}{{s.indexNumber}}
\ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/components/preview-students/preview-students.component.spec.ts b/TeachingAssistantUltimate/ClientApp/app/components/preview-students/preview-students.component.spec.ts new file mode 100644 index 0000000..14454e8 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/preview-students/preview-students.component.spec.ts @@ -0,0 +1,25 @@ +/// +import { TestBed, async, ComponentFixture, ComponentFixtureAutoDetect } from '@angular/core/testing'; +import { BrowserModule, By } from "@angular/platform-browser"; +import { PreviewStudentsComponent } from './preview-students.component'; + +let component: PreviewStudentsComponent; +let fixture: ComponentFixture; + +describe('preview-students component', () => { + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ PreviewStudentsComponent ], + imports: [ BrowserModule ], + providers: [ + { provide: ComponentFixtureAutoDetect, useValue: true } + ] + }); + fixture = TestBed.createComponent(PreviewStudentsComponent); + component = fixture.componentInstance; + })); + + it('should do something', async(() => { + expect(true).toEqual(true); + })); +}); \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/components/preview-students/preview-students.component.ts b/TeachingAssistantUltimate/ClientApp/app/components/preview-students/preview-students.component.ts new file mode 100644 index 0000000..bf45702 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/preview-students/preview-students.component.ts @@ -0,0 +1,30 @@ +import { Component } from '@angular/core'; +import { StudentsService } from '../../../Services/students.service'; +import { IStudents } from '../../model/IStudents'; +import { StudentsHttpProvider } from '../../providers/students-http-provider'; +import { HttpHandler } from '../../providers/HttpHandler'; +import { HttpErrorResponse } from '@angular/common/http'; +import { Router, ActivatedRoute } from '@angular/router'; +import { IClasses } from '../../model/IClasses'; +import { ISubjects } from '../../model/ISubjects'; + +@Component({ + selector: 'bs-preview-students', + templateUrl: './preview-students.component.html', + styleUrls: ['./preview-students.component.css'] +}) +/** preview-students component*/ +export class PreviewStudentsComponent { + students: IStudents[]; + _class: IClasses; + constructor(stds: StudentsService, private http: StudentsHttpProvider, private hand: HttpHandler, private router:Router, route:ActivatedRoute) { + this.students = stds.get(); + this._class = route.snapshot.data["class"]; + } + save() { + this.http.add(this.students).subscribe((res: IStudents[]) => { + this.router.navigate(['/classes']); + }, (err: HttpErrorResponse) => this.hand.handleError(err)); + } + +} \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/components/smart-entry/smart-entry.component.css b/TeachingAssistantUltimate/ClientApp/app/components/smart-entry/smart-entry.component.css new file mode 100644 index 0000000..e02abfc --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/smart-entry/smart-entry.component.css @@ -0,0 +1 @@ + diff --git a/TeachingAssistantUltimate/ClientApp/app/components/smart-entry/smart-entry.component.html b/TeachingAssistantUltimate/ClientApp/app/components/smart-entry/smart-entry.component.html new file mode 100644 index 0000000..c78c1c5 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/smart-entry/smart-entry.component.html @@ -0,0 +1,125 @@ +Smart entry of results +

Smart results entry

+
+
+ Provide the initial details +
+ +
+ +
+ The maximum {{form.controls.sid.errors.sid.sid}} + Select a subject + The minimum {{form.controls.sid.errors.min.min}} +
+
+ +
+ +
+ The maximum {{form.controls.type.errors.type.type}} + Select a type + The minimum {{form.controls.type.errors.min.min}} +
+
+ +
+ +
+ The maximum {{form.controls.max.errors.max.max}} + Enter max score + The minimum {{form.controls.max.errors.min.min}} +
+
+ +
+ +
+ The maximum length is {{form.controls.tag.errors.maxlength.requiredLength}} characters: Current is {{form.controls.tag.errors.maxlength.actualLength}} + Enter tag + The minimum length is {{form.controls.tag.errors.minlength.requiredLength}} characters: Current is {{form.controls.tag.errors.minlength.actualLength}} +
+
+ +
+ +
+ The maximum {{form.controls.number.errors.max.max}} + Enter number + The minimum {{form.controls.number.errors.min.min}} +
+
+ +
+ +
+ The maximum {{form.controls.score.errors.max.max}} + Enter score + The minimum {{form.controls.score.errors.min.min}} +
+
+ +
+
{{hand.message}}
+
+
+

Results of students

+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + +
Results of students in {{_class.className}}
NameIndex NumberScoreRemove
{{r.name}}{{r.indexNumber}}{{r.score}} + +
\ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/components/smart-entry/smart-entry.component.spec.ts b/TeachingAssistantUltimate/ClientApp/app/components/smart-entry/smart-entry.component.spec.ts new file mode 100644 index 0000000..f44a767 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/smart-entry/smart-entry.component.spec.ts @@ -0,0 +1,25 @@ +/// +import { TestBed, async, ComponentFixture, ComponentFixtureAutoDetect } from '@angular/core/testing'; +import { BrowserModule, By } from "@angular/platform-browser"; +import { SmartEntryComponent } from './smart-entry.component'; + +let component: SmartEntryComponent; +let fixture: ComponentFixture; + +describe('smart-entry component', () => { + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ SmartEntryComponent ], + imports: [ BrowserModule ], + providers: [ + { provide: ComponentFixtureAutoDetect, useValue: true } + ] + }); + fixture = TestBed.createComponent(SmartEntryComponent); + component = fixture.componentInstance; + })); + + it('should do something', async(() => { + expect(true).toEqual(true); + })); +}); \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/components/smart-entry/smart-entry.component.ts b/TeachingAssistantUltimate/ClientApp/app/components/smart-entry/smart-entry.component.ts new file mode 100644 index 0000000..0c296e4 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/smart-entry/smart-entry.component.ts @@ -0,0 +1,153 @@ +import { Component } from '@angular/core'; +import { FormGroup, FormBuilder, Validators } from '@angular/forms'; +import { IStudents } from '../../model/IStudents'; +import { IResults } from '../../model/IResults'; +import { ActivatedRoute } from '@angular/router'; +import { IClasses } from '../../model/IClasses'; +import { HttpHandler } from '../../providers/HttpHandler'; +import { HttpErrorResponse } from '@angular/common/http'; +import { ResultsHttpProvider } from '../../providers/results-http-provider'; +import { ISubjects } from '../../model/ISubjects'; +import { IAssTypes } from '../../model/IAssTypes'; +import { IResultsEntry } from '../../model/IResultsEntry'; +import { IResultsDisplay } from '../../model/IResultsDisplay'; + +@Component({ + selector: 'bs-smart-entry', + templateUrl: './smart-entry.component.html', + styleUrls: ['./smart-entry.component.css'] +}) +/** smart-entry component*/ +export class SmartEntryComponent { + form: FormGroup; + students: IStudents[]; + results: IResultsEntry[] = []; + _class: IClasses; + subjects: ISubjects[]; + types: IAssTypes[] + maxScore: number = 20; + canUpload: boolean = false; + constructor(private http: ResultsHttpProvider, fb: FormBuilder, route: ActivatedRoute, public hand: HttpHandler) { + this.form = this.initForm(fb); + this.students = route.snapshot.data["students"]; + this._class = route.snapshot.data["class"]; + this.subjects = route.snapshot.data["subjects"]; + this.types = route.snapshot.data["types"]; + } + + private initForm(fb: FormBuilder): FormGroup { + return fb.group({ + number: [0, Validators.compose([Validators.required, Validators.min(1)])], + score: [0, Validators.compose([Validators.required, Validators.min(0), Validators.max(this.maxScore)])], + type: ["", Validators.compose([Validators.required, Validators.min(1)])], + tag: ["", Validators.compose([Validators.required, Validators.minLength(3), Validators.maxLength(20)])], + sid: ["", Validators.compose([Validators.required, Validators.min(1)])], + max: [this.maxScore, Validators.compose([Validators.required, Validators.min(1)])] + }); + } + + private getIx(num: number) { + return `${this._class.indexPrefix}${this.getPad(num)}`; + } + + addScore(res: { number: number, score: number, type: number, sid: number, tag: string }) { + let ixn = this.getIx(res.number); + let std: IStudents = this.students.find(x => x.indexNumber === ixn) as IStudents; + if (!std) { + alert(`No student was found matching the index number : ${ixn} provided`); + this.focus(); + return; + } + else if (this.results.some(x => x.studentsID === std.studentsID)) { + alert("Results for this student has previously been added"); + this.focus(); + return; + } + else { + let _res: IResultsEntry = { + assessmentTypesID: res.type, score: res.score, studentsID: std.studentsID, subjectsID: res.sid, totalScore: this.maxScore, + tag: res.tag, indexNumber: std.indexNumber, + name: std.name + } as IResultsEntry; + this.results.unshift(_res); + this.form.controls['number'].reset(); + this.form.controls['score'].reset(); + this.focus(); + } + } + + focus() { + let inp = document.getElementById('number') as HTMLInputElement; + inp.focus(); + } + + remove(std: IResultsEntry) { + let ix: number = this.results.findIndex(x => x.studentsID === std.studentsID); + this.results.splice(ix, 1); + } + + save(res: { number: number, score: number, type: number, sid: number, tag: string }) { + if (this.results.length !== this.students.length) { + if (confirm("There were some students without results. Do you want to continue by setting their score to Zero (0)")) { + this.students.forEach(x => { + if (!this.results.some(t => t.studentsID === x.studentsID)) { + this.results.unshift({ + assessmentTypesID: res.type, score: 0, studentsID: x.studentsID, subjectsID: res.sid, totalScore: this.maxScore, tag: res.tag, name: x.name, indexNumber: x.indexNumber + } as IResultsEntry) + } + }); + + alert("Results have been prepared. Kindly click on the upload button.\nAlternative press the space bar or enter if you are using any assisstive technology after you have dismissed this alert by pressing the escape key"); + this.canUpload = true; + let but = document.getElementById('upload') as HTMLButtonElement; + but.focus(); + } + else { + alert("The process was canceled. Add the results of the missing students or let the system set it to zero"); + } + } + else this.addResults(); + } + + addResults() { + this.http.add(this.results).subscribe((res: IResultsDisplay[]) => { + + }, (err: HttpErrorResponse) => this.hand.handleError(err)); + } + + private getPad(num: number): string { + let ixn: string; + switch (this._class.padding) { + case 1: + ixn = "0"; + break; + case 2: + ixn = "00"; + break; + case 3: + ixn = "000"; + break; + case 4: + ixn = "0000"; + break; + default: + ixn = ""; + } + switch (num.toString().length) { + case 2: + ixn = ixn.substr(1) + num; + break; + case 3: + ixn = ixn.substr(2) + num; + break; + case 4: + ixn = ixn.substr(3) + num; + break; + default: + ixn = ixn + num; + } + return ixn; + } + + +} \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/components/subjects/subjects.component.html b/TeachingAssistantUltimate/ClientApp/app/components/subjects/subjects.component.html index c200db2..ad68a94 100644 --- a/TeachingAssistantUltimate/ClientApp/app/components/subjects/subjects.component.html +++ b/TeachingAssistantUltimate/ClientApp/app/components/subjects/subjects.component.html @@ -1,27 +1,41 @@ Subjects

Subjects

-
- Add a new subject -
- -
- -
- The maximum length is {{form.controls.subject.errors.maxlength.requiredLength}} characters: Current is {{form.controls.subject.errors.maxlength.actualLength}} - Enter subject - The minimum length is {{form.controls.subject.errors.minlength.requiredLength}} characters: Current is {{form.controls.subject.errors.minlength.actualLength}} -
-
- -
-
{{hand.message}}
-
+
+ Add a new subject +
+ +
+ +
+ The maximum length is {{form.controls.subject.errors.maxlength.requiredLength}} characters: Current is {{form.controls.subject.errors.maxlength.actualLength}} + Enter subject + The minimum length is {{form.controls.subject.errors.minlength.requiredLength}} characters: Current is {{form.controls.subject.errors.minlength.actualLength}} +
+
+ +
+ +
+ The maximum length is {{form.controls.subjectCode.errors.maxlength.requiredLength}} characters: Current is {{form.controls.subjectCode.errors.maxlength.actualLength}} + Enter subject code + The minimum length is {{form.controls.subjectCode.errors.minlength.requiredLength}} characters: Current is {{form.controls.subjectCode.errors.minlength.actualLength}} +
+
+ +
+
{{hand.message}}
+

Your saved subjects

@@ -29,6 +43,7 @@

Your saved subjects

Subject + Code Questions Topics Edit @@ -40,6 +55,7 @@

Your saved subjects

{{s.subject}} + {{s.subjectCode}} {{s.count}} {{t + ','}} diff --git a/TeachingAssistantUltimate/ClientApp/app/components/subjects/subjects.component.ts b/TeachingAssistantUltimate/ClientApp/app/components/subjects/subjects.component.ts index 4932f49..4555785 100644 --- a/TeachingAssistantUltimate/ClientApp/app/components/subjects/subjects.component.ts +++ b/TeachingAssistantUltimate/ClientApp/app/components/subjects/subjects.component.ts @@ -26,7 +26,8 @@ export class SubjectsComponent implements OnInit { InitForm(fb: FormBuilder): FormGroup { return fb.group({ - subject: ["", Validators.compose([Validators.required, Validators.minLength(5), Validators.maxLength(200)])] + subject: ["", Validators.compose([Validators.required, Validators.minLength(5), Validators.maxLength(200)])], + subjectCode: ["", Validators.compose([Validators.required, Validators.minLength(3), Validators.maxLength(10)])] }) } diff --git a/TeachingAssistantUltimate/ClientApp/app/components/tag-results/tag-results.component.css b/TeachingAssistantUltimate/ClientApp/app/components/tag-results/tag-results.component.css new file mode 100644 index 0000000..e02abfc --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/tag-results/tag-results.component.css @@ -0,0 +1 @@ + diff --git a/TeachingAssistantUltimate/ClientApp/app/components/tag-results/tag-results.component.html b/TeachingAssistantUltimate/ClientApp/app/components/tag-results/tag-results.component.html new file mode 100644 index 0000000..3b94486 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/tag-results/tag-results.component.html @@ -0,0 +1,161 @@ + +tag results + +
+
+
Class
+
{{_class.className}}
+
+
+
+ Select the initial data +
+ +
+ +
+ The maximum length is {{form.controls.subjectsID.errors.max.max}} characters: Current is {{form.controls.subjectsID.errors.max.max}} + Enter subjectsID + The minimum length is {{form.controls.subjectsID.errors.min.min}} characters: Current is {{form.controls.subjectsID.errors.min.min}} +
+
+ +
+ +
+ The maximum length is {{form.controls.tag.errors.maxlength.requiredLength}} characters: Current is {{form.controls.tag.errors.maxlength.actualLength}} + Enter tag + The minimum length is {{form.controls.tag.errors.minlength.requiredLength}} characters: Current is {{form.controls.tag.errors.minlength.actualLength}} +
+
+
+ +
+
+

Student Results

+ + + + + + + + + + + + + + + + +
NameIndex NumberScore
{{r.name}}{{r.indexNumber}}{{r.score}} + +
+
+
+

Edit {{editForm.controls.name.value}} results

+
+
+ Supply new score +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+ The maximum length is {{editForm.controls.subjectsID.errors.max.max}} characters: Current is {{editForm.controls.subjectsID.errors.max.max}} + Enter subjectsID + The minimum length is {{editForm.controls.subjectsID.errors.min.min}} characters: Current is {{editForm.controls.subjectsID.errors.min.min}} +
+
+ +
+ +
+ The maximum length is {{editForm.controls.tag.errors.maxlength.requiredLength}} characters: Current is {{editForm.controls.tag.errors.maxlength.actualLength}} + Enter tag + The minimum length is {{editForm.controls.tag.errors.minlength.requiredLength}} characters: Current is {{editForm.controls.tag.errors.minlength.actualLength}} +
+
+ +
+ +
+ The maximum length is {{editForm.controls.assessmentTypesID.errors.max.max}} characters: Current is {{editForm.controls.assessmentTypesID.errors.max.max}} + Select assessment type + The minimum length is {{editForm.controls.assessmentTypesID.errors.min.min}} characters: Current is {{editForm.controls.assessmentTypesID.errors.min.min}} +
+
+ +
+ +
+ The maximum {{editForm.controls.totalScore.errors.max.max}} + Enter maximum score + The minimum length is {{editForm.controls.totalScore.errors.min.min}} characters: Current is {{editForm.controls.totalScore.errors.min.min}} +
+
+ +
+ +
+ +
+
+ + +
+
+
+
\ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/components/tag-results/tag-results.component.spec.ts b/TeachingAssistantUltimate/ClientApp/app/components/tag-results/tag-results.component.spec.ts new file mode 100644 index 0000000..7d58a8f --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/tag-results/tag-results.component.spec.ts @@ -0,0 +1,25 @@ +/// +import { TestBed, async, ComponentFixture, ComponentFixtureAutoDetect } from '@angular/core/testing'; +import { BrowserModule, By } from "@angular/platform-browser"; +import { TagResultsComponent } from './tag-results.component'; + +let component: TagResultsComponent; +let fixture: ComponentFixture; + +describe('tag-results component', () => { + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ TagResultsComponent ], + imports: [ BrowserModule ], + providers: [ + { provide: ComponentFixtureAutoDetect, useValue: true } + ] + }); + fixture = TestBed.createComponent(TagResultsComponent); + component = fixture.componentInstance; + })); + + it('should do something', async(() => { + expect(true).toEqual(true); + })); +}); \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/components/tag-results/tag-results.component.ts b/TeachingAssistantUltimate/ClientApp/app/components/tag-results/tag-results.component.ts new file mode 100644 index 0000000..de7f028 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/tag-results/tag-results.component.ts @@ -0,0 +1,94 @@ +import { Component } from '@angular/core'; +import { ITags } from '../../model/ITags'; +import { ISubjects } from '../../model/ISubjects'; +import { IResults } from '../../model/IResults'; +import { ActivatedRoute, Router } from '@angular/router'; +import { HttpHandler } from '../../providers/HttpHandler'; +import { ResultsHttpProvider } from '../../providers/results-http-provider'; +import { FormGroup, FormBuilder, Validators, FormControl } from '@angular/forms'; +import { IClasses } from '../../model/IClasses'; +import { HttpErrorResponse } from '@angular/common/http'; +import { IResultsDisplay } from '../../model/IResultsDisplay'; +import { IAssTypes } from '../../model/IAssTypes'; +import { rootRenderNodes } from '@angular/core/src/view'; +import { IResultsEntry } from '../../model/IResultsEntry'; + +@Component({ + selector: 'bs-tag-results', + templateUrl: './tag-results.component.html', + styleUrls: ['./tag-results.component.css'] +}) +/** tag-results component*/ +export class TagResultsComponent { + tags: ITags[]; + _class: IClasses; + subjects: ISubjects[]; + results: IResultsDisplay[] = []; + form: FormGroup; + editForm!: FormGroup;; + status: boolean = true; + types: IAssTypes[]; + + constructor(route: ActivatedRoute, public hand: HttpHandler, private http: ResultsHttpProvider, private router: Router) { + this.tags = route.snapshot.data["tags"] as ITags[]; + this.types = route.snapshot.data["types"] as IAssTypes[]; + this.subjects = route.snapshot.data["subjects"] as ISubjects[]; + this._class = route.snapshot.data["class"] as IClasses; + this.form = new FormBuilder().group({ + tag: ["", Validators.compose([Validators.required, Validators.min(1)])], + subjectsID: ["", Validators.compose([Validators.required, Validators.min(1)])] + }); + this.editForm = new FormBuilder().group({ + studentsID: new FormControl({ value: "", disabled: true }), + name: new FormControl({ value: "", disabled: true }), + resultsID: new FormControl({ value: "", disabled: true }), + indexNumber: new FormControl({ value: "", disabled: true }), + assessmentTypesID: new FormControl({ value: "", disabled: true }), + score: new FormControl({ value: "", disabled: false }, Validators.compose([Validators.required, Validators.min(0), Validators.max(0)])), + totalScore: new FormControl({ value: "", disabled: true }), + tag: new FormControl({ value: "", disabled: true }), + subjectsID: new FormControl({ value: "", disabled: true }) + }); + } + + search(fm: { tag: ITags, subjectsID: number }) { + this.hand.processing = true; + this.hand.error = false; + this.http.resultsByTags(fm.tag.tag, this._class.classesID, fm.subjectsID).subscribe(res => this.results = res, (err: HttpErrorResponse) => this.hand.handleError(err)) + this.hand.processing = false; + } + + edit(res: any) { + this.editForm = new FormBuilder().group({ + studentsID: [res.studentsID], + name: [res.name], + resultsID: [res.resultsID], + indexNumber: [res.indexNumber], + assessmentTypesID: [res.assessmentTypesID], + score: [res.score, [Validators.compose([Validators.required, Validators.min(0), Validators.max(res.totalScore)])]], + totalScore: [res.totalScore], + tag: [res.tag], + subjectsID: [res.subjectsID] + }); + this.editForm.updateValueAndValidity({ onlySelf: true, emitEvent: true }) + this.status = false + } + + cancelEdit() { + this.status = true; + console.log(this.status); + } + + save(res: any) { + if (confirm("Do you want to make the changes?")) { + this.hand.processing = true; + this.hand.error = false; + this.http.edit(res as IResults).subscribe(_res => { + alert("Changes were made successfully"); + this.search(this.form.value); + this.status = !this.status; + }, (err: HttpErrorResponse) => this.hand.handleError(err)); + } + this.hand.processing = false; + } +} \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/components/viw-results/viw-results.component.css b/TeachingAssistantUltimate/ClientApp/app/components/viw-results/viw-results.component.css new file mode 100644 index 0000000..e02abfc --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/viw-results/viw-results.component.css @@ -0,0 +1 @@ + diff --git a/TeachingAssistantUltimate/ClientApp/app/components/viw-results/viw-results.component.html b/TeachingAssistantUltimate/ClientApp/app/components/viw-results/viw-results.component.html new file mode 100644 index 0000000..42bb112 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/viw-results/viw-results.component.html @@ -0,0 +1,33 @@ +View student results +

View Students Results

+
+
Class
+
{{_class.className}}
+
+
+ +
+ +
+
+
+ +
+ + + + + + + + + + + + + + + +
NameIndex Number{{t.assessmentType}}
{{r.name}}{{r.indexNumber}}{{s.sumScore}}
\ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/components/viw-results/viw-results.component.spec.ts b/TeachingAssistantUltimate/ClientApp/app/components/viw-results/viw-results.component.spec.ts new file mode 100644 index 0000000..8f9fe3c --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/viw-results/viw-results.component.spec.ts @@ -0,0 +1,25 @@ +/// +import { TestBed, async, ComponentFixture, ComponentFixtureAutoDetect } from '@angular/core/testing'; +import { BrowserModule, By } from "@angular/platform-browser"; +import { ViwResultsComponent } from './viw-results.component'; + +let component: ViwResultsComponent; +let fixture: ComponentFixture; + +describe('viw-results component', () => { + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ViwResultsComponent ], + imports: [ BrowserModule ], + providers: [ + { provide: ComponentFixtureAutoDetect, useValue: true } + ] + }); + fixture = TestBed.createComponent(ViwResultsComponent); + component = fixture.componentInstance; + })); + + it('should do something', async(() => { + expect(true).toEqual(true); + })); +}); \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/components/viw-results/viw-results.component.ts b/TeachingAssistantUltimate/ClientApp/app/components/viw-results/viw-results.component.ts new file mode 100644 index 0000000..7b7be1e --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/components/viw-results/viw-results.component.ts @@ -0,0 +1,35 @@ +import { Component } from '@angular/core'; +import { IClasses } from '../../model/IClasses'; +import { ISubjects } from '../../model/ISubjects'; +import { IResultsDisplay } from '../../model/IResultsDisplay'; +import { ActivatedRoute, Router } from '@angular/router'; +import { ResultsHttpProvider } from '../../providers/results-http-provider'; +import { HttpErrorResponse } from '@angular/common/http'; +import { HttpHandler } from '../../providers/HttpHandler'; +import { PrintProviderService } from '../../providers/print-provider.service'; + +@Component({ + selector: 'bs-viw-results', + templateUrl: './viw-results.component.html', + styleUrls: ['./viw-results.component.css'] +}) +/** viw-results component*/ +export class ViwResultsComponent { + _class: IClasses; + subjects: ISubjects[]; + results: IResultsDisplay = { resultsID: 0, results: [], types: [] }; + subject: any; + header: string = ""; + constructor(route: ActivatedRoute, private router: Router, private http: ResultsHttpProvider, private hand: HttpHandler, private printer: PrintProviderService) { + this._class = route.snapshot.data['class'] as IClasses; + this.subjects = route.snapshot.data['subjects'] as ISubjects[]; + } + + get(id: number) { + this.http.viewResults(this._class.classesID, id).subscribe(res => this.results = res, ((err: HttpErrorResponse) => this.hand.handleError(err))) + } + + print(): void { + this.printer.print(`${this.subjects[0].subject} : ${this.subjects[0].subjectCode}`); + } +} \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/model/IAssTypes.ts b/TeachingAssistantUltimate/ClientApp/app/model/IAssTypes.ts new file mode 100644 index 0000000..10e4581 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/model/IAssTypes.ts @@ -0,0 +1,5 @@ +export interface IAssTypes { + assessmentTypesID: number; + assessmentType: string; + total: number; +} \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/model/IClasses.ts b/TeachingAssistantUltimate/ClientApp/app/model/IClasses.ts new file mode 100644 index 0000000..c82b174 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/model/IClasses.ts @@ -0,0 +1,10 @@ +import { IStudents } from "./IStudents"; + +export interface IClasses { + classesID: number; + className: number; + indexPrefix: string; + concurrency: string; + students: IStudents[] + padding: number; +} \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/model/IResults.ts b/TeachingAssistantUltimate/ClientApp/app/model/IResults.ts new file mode 100644 index 0000000..22a2272 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/model/IResults.ts @@ -0,0 +1,9 @@ +export interface IResults { + resultsID: number; + studentsID: number; + subjectsID: number; + assessmentTypesID: number; + score: number; + totalScore: number; + tag: string; +} \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/model/IResultsDisplay.ts b/TeachingAssistantUltimate/ClientApp/app/model/IResultsDisplay.ts new file mode 100644 index 0000000..5624c73 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/model/IResultsDisplay.ts @@ -0,0 +1,15 @@ +import { IStudentSum } from "./IStudentSum"; + +export interface IResultsDisplay { + resultsID: number; + types: Array<{ + assessmentType: string, + assessmentTypesID: number, + total: number + }>; + results: Array<{ + studentsID: number; + name: string; + results: IStudentSum[] + }>; +} \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/model/IResultsEntry.ts b/TeachingAssistantUltimate/ClientApp/app/model/IResultsEntry.ts new file mode 100644 index 0000000..838b5d4 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/model/IResultsEntry.ts @@ -0,0 +1,10 @@ +import { IResults } from "./IResults"; + +export interface IResultsEntry { + studentsID: number; + subjectsID: number; + assessmentTypesID: number; + score: number; + totalScore: number; + tag: string; +} \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/model/IStudentSum.ts b/TeachingAssistantUltimate/ClientApp/app/model/IStudentSum.ts new file mode 100644 index 0000000..21b1916 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/model/IStudentSum.ts @@ -0,0 +1,7 @@ +export interface IStudentSum { + assessmentType: string; + assessmentTypesID: number; + sumScore: number; + sumTotal: number; + assessmentTotal: number; +} \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/model/IStudents.ts b/TeachingAssistantUltimate/ClientApp/app/model/IStudents.ts new file mode 100644 index 0000000..0af0aa7 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/model/IStudents.ts @@ -0,0 +1,10 @@ +import { IClasses } from "./IClasses"; + +export interface IStudents { + classesID: number; + name: number; + indexNumber: string; + studentsID: number, + classes:IClasses + +} \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/model/ISubjects.ts b/TeachingAssistantUltimate/ClientApp/app/model/ISubjects.ts index 3d507ca..81ac9d7 100644 --- a/TeachingAssistantUltimate/ClientApp/app/model/ISubjects.ts +++ b/TeachingAssistantUltimate/ClientApp/app/model/ISubjects.ts @@ -2,5 +2,6 @@ export interface ISubjects { subjectsID: number; concurrency: string; count: number; - subject: string; + subject: string; + subjectCode: string; } diff --git a/TeachingAssistantUltimate/ClientApp/app/model/ITags.ts b/TeachingAssistantUltimate/ClientApp/app/model/ITags.ts new file mode 100644 index 0000000..b2d69e1 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/model/ITags.ts @@ -0,0 +1,6 @@ +export interface ITags { + tag: string; + asessmentType: string; + assessmentTypesID: number; + totalScore: number; +} \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/providers/HttpHandler.ts b/TeachingAssistantUltimate/ClientApp/app/providers/HttpHandler.ts index 00ae218..a26adf9 100644 --- a/TeachingAssistantUltimate/ClientApp/app/providers/HttpHandler.ts +++ b/TeachingAssistantUltimate/ClientApp/app/providers/HttpHandler.ts @@ -2,20 +2,21 @@ import { HttpErrorResponse } from "@angular/common/http"; export class HttpHandler { - message: string = ""; - processing: boolean = false; - error: boolean = false; - constructor() { + message: string = ""; + processing: boolean = false; + error: boolean = false; + constructor() { - } - - handleError(err: HttpErrorResponse) { - this.error = true; - if (err.error!.message) { - this.message = err.error.message; } - else { - this.message = err.statusText; + + handleError(err: HttpErrorResponse) { + this.error = true; + if (err.error!.message) { + this.message = err.error.message; + } + else { + this.message = err.statusText; + } + alert(this.message); } - } } diff --git a/TeachingAssistantUltimate/ClientApp/app/providers/ass-types-http-provider.ts b/TeachingAssistantUltimate/ClientApp/app/providers/ass-types-http-provider.ts new file mode 100644 index 0000000..369daca --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/providers/ass-types-http-provider.ts @@ -0,0 +1,32 @@ +import { Injectable } from '@angular/core'; +import { Observable } from 'rxjs/Observable'; +import { HttpClient } from '@angular/common/http'; +import { IAssTypes } from '../model/IAssTypes'; + +@Injectable() +export class AssessTypeHttpProvider { + + getAssTypes(): Observable { + return this.http.get("/AssessTypes/List"); + } + + findAssTypes(id: number): Observable { + return this.http.get(`/AssessTypes/Find?id=${id}`); + } + + addAssTypes(ass: IAssTypes): Observable { + return this.http.post('/AssessTypes/Create', ass); + } + + editAssTypes(ass: IAssTypes): Observable { + return this.http.post('/AssessTypes/Edit', ass); + } + + deleteAssTypes(ass: IAssTypes): Observable { + return this.http.post('/AssessTypes/Delete', ass); + } + + constructor(private http: HttpClient) { + + } +} \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/providers/classes-http-provider.ts b/TeachingAssistantUltimate/ClientApp/app/providers/classes-http-provider.ts new file mode 100644 index 0000000..ec9ccd0 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/providers/classes-http-provider.ts @@ -0,0 +1,32 @@ +import { Injectable } from '@angular/core'; +import { Observable } from 'rxjs/Observable'; +import { HttpClient } from '@angular/common/http'; +import { IClasses } from '../model/IClasses'; + +@Injectable() +export class ClassessHttpProvider { + + getAll(): Observable { + return this.http.get("/Classes/List"); + } + + find(id: number): Observable { + return this.http.get(`/Classes/Find?id=${id}`); + } + + add(ass: IClasses): Observable { + return this.http.post('/Classes/Create', ass); + } + + edit(ass: IClasses): Observable { + return this.http.post('/Classes/Edit', ass); + } + + delete(ass: IClasses): Observable { + return this.http.post('/Classes/Delete', ass); + } + + constructor(private http: HttpClient) { + + } +} \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/providers/http-provider.ts b/TeachingAssistantUltimate/ClientApp/app/providers/http-provider.ts index 2158901..8b40c03 100644 --- a/TeachingAssistantUltimate/ClientApp/app/providers/http-provider.ts +++ b/TeachingAssistantUltimate/ClientApp/app/providers/http-provider.ts @@ -5,9 +5,11 @@ import { HttpClient } from '@angular/common/http'; import { IQuestions } from '../model/IQuestsions'; import { ITests } from '../model/ITests'; import { ITopics } from '../model/ITopics'; +import { IAssTypes } from '../model/IAssTypes'; @Injectable() export class HttpProvider { + genQuestions(args: ITests): Observable { return this.http.post("/Questions/Generate", args) } diff --git a/TeachingAssistantUltimate/ClientApp/app/providers/results-http-provider.ts b/TeachingAssistantUltimate/ClientApp/app/providers/results-http-provider.ts new file mode 100644 index 0000000..e1f181e --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/providers/results-http-provider.ts @@ -0,0 +1,53 @@ +import { Injectable } from '@angular/core'; +import { Observable } from 'rxjs/Observable'; +import { HttpClient } from '@angular/common/http'; +import { IResults } from '../model/IResults'; +import { IResultsDisplay } from '../model/IResultsDisplay'; +import { ISubjects } from '../model/ISubjects'; +import { IResultsEntry } from '../model/IResultsEntry'; +import { ITags } from '../model/ITags'; + +@Injectable() +export class ResultsHttpProvider { + + viewResults(cid: number, sid: number): Observable { + return this.http.get(`/Results/List?cid=${cid}&sid=${sid}`); + } + + classSubjects(id: number): Observable { + return this.http.get(`/Results/ClassSubjects?id=${id}`); + } + + getTags(cid: number): Observable { + return this.http.get(`Results/Tags?cid=${cid}`) + } + + resultsByTags(tag: string, cid: number, sid: number): Observable { + return this.http.get(`Results/TagResults?cid=${cid}&tag=${tag}&sid=${sid}`) + } + + getAll(cid: number, sid: number): Observable { + return this.http.get(`/Results/List?id=${cid}&sid=${sid}`); + } + + + find(id: number): Observable { + return this.http.get(`/Results/Find?id=${id}`); + } + + add(res: IResultsEntry[]): Observable { + return this.http.post('/Results/Create', res); + } + + edit(res: IResults): Observable { + return this.http.post('/Results/Edit', res); + } + + delete(res: IResults): Observable { + return this.http.post('/Results/Delete', res); + } + + constructor(private http: HttpClient) { + + } +} \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/providers/students-http-provider.ts b/TeachingAssistantUltimate/ClientApp/app/providers/students-http-provider.ts new file mode 100644 index 0000000..62a154f --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/providers/students-http-provider.ts @@ -0,0 +1,32 @@ +import { Injectable } from '@angular/core'; +import { Observable } from 'rxjs/Observable'; +import { HttpClient } from '@angular/common/http'; +import { IStudents } from '../model/IStudents'; + +@Injectable() +export class StudentsHttpProvider { + + getAll(id:number): Observable { + return this.http.get(`/Students/List?id=${id}`); + } + + find(id: number): Observable { + return this.http.get(`/Students/Find?id=${id}`); + } + + add(stds: IStudents[]): Observable { + return this.http.post('/Students/Create', stds); + } + + edit(std: IStudents): Observable { + return this.http.post('/Students/Edit', std); + } + + delete(std: IStudents): Observable { + return this.http.post('/Students/Delete', std); + } + + constructor(private http: HttpClient) { + + } +} \ No newline at end of file diff --git a/TeachingAssistantUltimate/ClientApp/app/resolvers/AssTypeResolver.ts b/TeachingAssistantUltimate/ClientApp/app/resolvers/AssTypeResolver.ts new file mode 100644 index 0000000..98fcd0d --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/resolvers/AssTypeResolver.ts @@ -0,0 +1,17 @@ +import { Injectable } from "@angular/core"; +import { Resolve, ActivatedRouteSnapshot } from "@angular/router"; +import { Observable } from "rxjs/Observable"; +import { HttpProvider } from "../providers/http-provider"; +import { IAssTypes } from "../model/IAssTypes"; +import { AssessTypeHttpProvider } from "../providers/ass-types-http-provider"; + +@Injectable() +export class AssTypeResolver implements Resolve> { + resolve(route: ActivatedRouteSnapshot): Observable { + return this.http.findAssTypes(parseInt(route.paramMap.get("id") as string)) as Observable; + } + + constructor(private http: AssessTypeHttpProvider) { + + } +} diff --git a/TeachingAssistantUltimate/ClientApp/app/resolvers/AssTypesResolver.ts b/TeachingAssistantUltimate/ClientApp/app/resolvers/AssTypesResolver.ts new file mode 100644 index 0000000..e46af50 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/resolvers/AssTypesResolver.ts @@ -0,0 +1,17 @@ +import { Injectable } from "@angular/core"; +import { Resolve, ActivatedRouteSnapshot } from "@angular/router"; +import { Observable } from "rxjs/Observable"; +import { HttpProvider } from "../providers/http-provider"; +import { IAssTypes } from "../model/IAssTypes"; +import { AssessTypeHttpProvider } from "../providers/ass-types-http-provider"; + +@Injectable() +export class AssTypesResolver implements Resolve> { + resolve(route: ActivatedRouteSnapshot): Observable { + return this.http.getAssTypes(); + } + + constructor(private http: AssessTypeHttpProvider) { + + } +} diff --git a/TeachingAssistantUltimate/ClientApp/app/resolvers/ClassResolver.ts b/TeachingAssistantUltimate/ClientApp/app/resolvers/ClassResolver.ts new file mode 100644 index 0000000..b66f660 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/resolvers/ClassResolver.ts @@ -0,0 +1,16 @@ +import { Injectable } from "@angular/core"; +import { Resolve, ActivatedRouteSnapshot } from "@angular/router"; +import { Observable } from "rxjs/Observable"; +import { IClasses } from "../model/IClasses"; +import { ClassessHttpProvider } from "../providers/classes-http-provider"; + +@Injectable() +export class ClassResolver implements Resolve> { + resolve(route: ActivatedRouteSnapshot): Observable { + return this.http.find(parseInt(route.paramMap.get("id") as string)) as Observable; + } + + constructor(private http: ClassessHttpProvider) { + + } +} diff --git a/TeachingAssistantUltimate/ClientApp/app/resolvers/ClassSubjectsResolver.ts b/TeachingAssistantUltimate/ClientApp/app/resolvers/ClassSubjectsResolver.ts new file mode 100644 index 0000000..acccec8 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/resolvers/ClassSubjectsResolver.ts @@ -0,0 +1,16 @@ +import { Injectable } from "@angular/core"; +import { Resolve, ActivatedRouteSnapshot } from "@angular/router"; +import { Observable } from "rxjs/Observable"; +import { ISubjects } from "../model/ISubjects"; +import { ResultsHttpProvider } from "../providers/results-http-provider"; + +@Injectable() +export class ClassSubjectsResolver implements Resolve { + resolve(route: ActivatedRouteSnapshot): ISubjects[] | Observable { + return this.http.classSubjects(parseInt(route.paramMap.get("id") as string)); + } + + constructor(private http: ResultsHttpProvider) { + + } +} diff --git a/TeachingAssistantUltimate/ClientApp/app/resolvers/ClassesResolver.ts b/TeachingAssistantUltimate/ClientApp/app/resolvers/ClassesResolver.ts new file mode 100644 index 0000000..5050605 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/resolvers/ClassesResolver.ts @@ -0,0 +1,17 @@ +import { Injectable } from "@angular/core"; +import { Resolve, ActivatedRouteSnapshot } from "@angular/router"; +import { Observable } from "rxjs/Observable"; +import { HttpProvider } from "../providers/http-provider"; +import { ClassessHttpProvider } from "../providers/classes-http-provider"; +import { IClasses } from "../model/IClasses"; + +@Injectable() +export class ClassesResolver implements Resolve> { + resolve(route: ActivatedRouteSnapshot): Observable { + return this.http.getAll(); + } + + constructor(private http: ClassessHttpProvider) { + + } +} diff --git a/TeachingAssistantUltimate/ClientApp/app/resolvers/StudentsResolver.ts b/TeachingAssistantUltimate/ClientApp/app/resolvers/StudentsResolver.ts new file mode 100644 index 0000000..4a8604c --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/resolvers/StudentsResolver.ts @@ -0,0 +1,17 @@ +import { Injectable } from "@angular/core"; +import { Resolve, ActivatedRouteSnapshot } from "@angular/router"; +import { Observable } from "rxjs/Observable"; +import { StudentsHttpProvider } from "../providers/students-http-provider"; +import { IStudents } from "../model/IStudents"; +import { parse } from "cfb/types"; + +@Injectable() +export class StudentsResolver implements Resolve { + resolve(route: ActivatedRouteSnapshot): IStudents[] | Observable { + return this.http.getAll(parseInt(route.paramMap.get("id") as string)); + } + + constructor(private http: StudentsHttpProvider) { + + } +} diff --git a/TeachingAssistantUltimate/ClientApp/app/resolvers/TagsResolver.ts b/TeachingAssistantUltimate/ClientApp/app/resolvers/TagsResolver.ts new file mode 100644 index 0000000..6d197b6 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/resolvers/TagsResolver.ts @@ -0,0 +1,17 @@ +import { Injectable } from "@angular/core"; +import { Resolve, ActivatedRouteSnapshot } from "@angular/router"; +import { Observable } from "rxjs/Observable"; +import { IQuestions } from "../model/IQuestsions"; +import { ITags } from "../model/ITags"; +import { ResultsHttpProvider } from "../providers/results-http-provider"; + +@Injectable() +export class TagsResolver implements Resolve> { + resolve(route: ActivatedRouteSnapshot): Observable { + return this.http.getTags(parseInt(route.paramMap.get("id") as string)); + } + + constructor(private http: ResultsHttpProvider) { + + } +} diff --git a/TeachingAssistantUltimate/ClientApp/app/resolvers/ViewResultsResolver.ts b/TeachingAssistantUltimate/ClientApp/app/resolvers/ViewResultsResolver.ts new file mode 100644 index 0000000..c7aa399 --- /dev/null +++ b/TeachingAssistantUltimate/ClientApp/app/resolvers/ViewResultsResolver.ts @@ -0,0 +1,17 @@ +import { Injectable } from "@angular/core"; +import { Resolve, ActivatedRouteSnapshot } from "@angular/router"; +import { Observable } from "rxjs/Observable"; +import { ISubjects } from "../model/ISubjects"; +import { ResultsHttpProvider } from "../providers/results-http-provider"; +import { IResultsDisplay } from "../model/IResultsDisplay"; + +@Injectable() +export class SubjectsResolver implements Resolve { + resolve(route: ActivatedRouteSnapshot): IResultsDisplay | Observable { + return this.http.viewResults(parseInt(route.paramMap.get("cid") as string), parseInt(route.paramMap.get("sid") as string)); + } + + constructor(private http: ResultsHttpProvider) { + + } +} diff --git a/TeachingAssistantUltimate/Context/ApplicationDbContext.cs b/TeachingAssistantUltimate/Context/ApplicationDbContext.cs index 804930d..4108c8f 100644 --- a/TeachingAssistantUltimate/Context/ApplicationDbContext.cs +++ b/TeachingAssistantUltimate/Context/ApplicationDbContext.cs @@ -1,14 +1,14 @@ using Microsoft.EntityFrameworkCore; -using TeachingAssistant.Model; +using TeachingAssistantUltimate.Model; -namespace TeachingAssistant.Context +namespace TeachingAssistantUltimate.Context { public class ApplicationDbContext : DbContext { public ApplicationDbContext(DbContextOptions options) : base(options) { - + } protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) @@ -24,8 +24,14 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) protected override void OnModelCreating(ModelBuilder builder) { builder.Entity(x => x.HasData( - new Subjects { Subject = "Public Health Nursing", SubjectsID = 1 }, - new Subjects { Subject = "Basic Infection Prevention and Control", SubjectsID = 2 } + new Subjects { Subject = "Public Health Nursing", SubjectsID = 1, SubjectCode = "001" }, + new Subjects { Subject = "Basic Infection Prevention and Control", SubjectsID = 2, SubjectCode = "002" } + )); + + builder.Entity(x => x.HasData( + new AssessmentTypes { AssessmentTypesID = 1, AssessmentType = "Quiz", Total = 10 }, + new AssessmentTypes { AssessmentTypesID = 2, AssessmentType = "Assignment", Total = 10 }, + new AssessmentTypes { AssessmentTypesID = 3, AssessmentType = "Mid-Sem", Total = 20 } )); base.OnModelCreating(builder); // Customize the ASP.NET Identity model and override the defaults if needed.// For example, you can rename the ASP.NET Identity table names and more.// Add your customizations after calling base.OnModelCreating(builder); @@ -36,5 +42,13 @@ protected override void OnModelCreating(ModelBuilder builder) public virtual DbSet Subjects { get; set; } public virtual DbSet Options { get; set; } + + public virtual DbSet Students { get; set; } + + public virtual DbSet Classes { get; set; } + + public virtual DbSet AssessmentTypes { get; set; } + + public virtual DbSet Results { get; set; } } } diff --git a/TeachingAssistantUltimate/Controllers/AssessTypesController.cs b/TeachingAssistantUltimate/Controllers/AssessTypesController.cs new file mode 100644 index 0000000..ce8037b --- /dev/null +++ b/TeachingAssistantUltimate/Controllers/AssessTypesController.cs @@ -0,0 +1,85 @@ +using System.Collections; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using TeachingAssistantUltimate.Context; +using TeachingAssistantUltimate.Model; + +namespace TeachingAssistantUltimate.Controllers +{ + public class AssessTypesController : Controller + { + private readonly DbContextOptions dco; + + public AssessTypesController(DbContextOptions options) => dco = options; + + [HttpGet] + public async Task Find(byte id) + { + var subj = await new ApplicationDbContext(dco).AssessmentTypes.Select(x => new + { + x.AssessmentType, + x.AssessmentTypesID, + x.Total + }).SingleOrDefaultAsync(x => x.AssessmentTypesID == id); + if (subj == null) + return NotFound(); + return Ok(subj); + } + + [HttpGet] + public async Task List() => await new ApplicationDbContext(dco).AssessmentTypes.Select(x => new { x.AssessmentTypesID, x.AssessmentType, x.Total }).ToListAsync(); + + [HttpPost] + public async Task Create([FromBody]AssessmentTypes assessment) + { + if (ModelState.IsValid) + { + using (var db = new ApplicationDbContext(dco)) + { + if (await db.AssessmentTypes.AnyAsync(x => x.AssessmentType == assessment.AssessmentType)) + return BadRequest(new { Message = "You have already saved this item" }); + db.Add(assessment); + await db.SaveChangesAsync(); + return Created($"/AssessTypes/Find/id={assessment.AssessmentTypesID}", assessment); + } + } + return BadRequest(new { Error = "Invalid data was submitted", Message = ModelState.Values.First(x => x.Errors.Count > 0).Errors.Select(t => t.ErrorMessage).First() }); + } + + [HttpPost] + public async Task Edit([FromBody]AssessmentTypes assessment) + { + if (ModelState.IsValid) + { + using (var db = new ApplicationDbContext(dco)) + { + if (!await db.AssessmentTypes.AnyAsync(x => x.AssessmentTypesID == assessment.AssessmentTypesID)) + return BadRequest(new { Message = "Class does not exists" }); + db.Entry(assessment).State = EntityState.Modified; + await db.SaveChangesAsync(); + } + return Ok(assessment); + } + return BadRequest(new { Error = "Invalid data was submitted", Message = ModelState.Values.First(x => x.Errors.Count > 0).Errors.Select(t => t.ErrorMessage).First() }); + } + + [HttpPost] + public async Task Delete([FromBody]AssessmentTypes assessment) + { + if (ModelState.IsValid) + { + using (var db = new ApplicationDbContext(dco)) + { + if (!await db.AssessmentTypes.AnyAsync(x => x.AssessmentTypesID == assessment.AssessmentTypesID)) + return BadRequest(new { Message = "Class was not found" }); + db.Entry(assessment).State = EntityState.Deleted; + await db.SaveChangesAsync(); + } + return Ok(new { message = "Class deleted" }); + } + return BadRequest(new { Error = "Invalid data was submitted", Message = ModelState.Values.First(x => x.Errors.Count > 0).Errors.Select(t => t.ErrorMessage).First() }); + } + } +} \ No newline at end of file diff --git a/TeachingAssistantUltimate/Controllers/ClassesController.cs b/TeachingAssistantUltimate/Controllers/ClassesController.cs new file mode 100644 index 0000000..d243c90 --- /dev/null +++ b/TeachingAssistantUltimate/Controllers/ClassesController.cs @@ -0,0 +1,88 @@ +using System.Collections; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using TeachingAssistantUltimate.Context; +using TeachingAssistantUltimate.Model; + +namespace TeachingAssistantUltimate.Controllers +{ + public class ClassesController : Controller + { + private readonly DbContextOptions dco; + + public ClassesController(DbContextOptions options) => dco = options; + + [HttpGet] + public async Task Find(int id) + { + var subj = await new ApplicationDbContext(dco).Classes.Select(x => new + { + x.ClassesID, + x.IndexPrefix, + x.ClassName, + x.Students.Count, + x.Padding, + x.Concurrency, + }).SingleOrDefaultAsync(x => x.ClassesID == id); + if (subj == null) + return NotFound(); + return Ok(subj); + } + + [HttpGet] + public async Task List() => await new ApplicationDbContext(dco).Classes.Select(x => new { x.Concurrency, x.Students.Count, x.ClassName, x.ClassesID, x.IndexPrefix, x.Padding }).ToListAsync(); + + [HttpPost] + public async Task Create([FromBody]Classes classes) + { + if (ModelState.IsValid) + { + using (var db = new ApplicationDbContext(dco)) + { + if (await db.Classes.AnyAsync(x => x.ClassName == classes.ClassName)) + return BadRequest(new { Message = "You have already saved this class name" }); + db.Add(classes); + await db.SaveChangesAsync(); + return Created($"/Classes/Find/id={classes.ClassesID}", classes); + } + } + return BadRequest(new { Error = "Invalid data was submitted", Message = ModelState.Values.First(x => x.Errors.Count > 0).Errors.Select(t => t.ErrorMessage).First() }); + } + + [HttpPost] + public async Task Edit([FromBody]Classes classes) + { + if (ModelState.IsValid) + { + using (var db = new ApplicationDbContext(dco)) + { + if (!await db.Classes.AnyAsync(x => x.ClassesID == classes.ClassesID)) + return BadRequest(new { Message = "Class does not exists" }); + db.Entry(classes).State = EntityState.Modified; + await db.SaveChangesAsync(); + } + return Ok(classes); + } + return BadRequest(new { Error = "Invalid data was submitted", Message = ModelState.Values.First(x => x.Errors.Count > 0).Errors.Select(t => t.ErrorMessage).First() }); + } + + [HttpPost] + public async Task Delete([FromBody]Classes classes) + { + if (ModelState.IsValid) + { + using (var db = new ApplicationDbContext(dco)) + { + if (!await db.Classes.AnyAsync(x => x.ClassesID == classes.ClassesID)) + return BadRequest(new { Message = "Class was not found" }); + db.Entry(classes).State = EntityState.Deleted; + await db.SaveChangesAsync(); + } + return Ok(new { message = "Class deleted" }); + } + return BadRequest(new { Error = "Invalid data was submitted", Message = ModelState.Values.First(x => x.Errors.Count > 0).Errors.Select(t => t.ErrorMessage).First() }); + } + } +} \ No newline at end of file diff --git a/TeachingAssistantUltimate/Controllers/HomeController.cs b/TeachingAssistantUltimate/Controllers/HomeController.cs index a58cc7f..a34eeb9 100644 --- a/TeachingAssistantUltimate/Controllers/HomeController.cs +++ b/TeachingAssistantUltimate/Controllers/HomeController.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using TeachingAssistant.Context; +using TeachingAssistantUltimate.Context; namespace TeachingAssistantUltimate.Controllers { diff --git a/TeachingAssistantUltimate/Controllers/PrintController.cs b/TeachingAssistantUltimate/Controllers/PrintController.cs deleted file mode 100644 index 7849a24..0000000 --- a/TeachingAssistantUltimate/Controllers/PrintController.cs +++ /dev/null @@ -1,58 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using ElectronNET.API; -using System.Threading.Tasks; -using Aspose.Html; -using System; -using System.IO; -using Aspose.Html.Drawing; -using Aspose.Html.Rendering.Pdf; -using Aspose.Html.Rendering; -using Aspose.Html.Dom; -using System.Collections.Generic; -using TeachingAssistant.Model.ViewModels; - -namespace TeachingAssistant.Controllers -{ - public class PrintController : Controller - { - public async Task Index(int id) - { - var req = Request.Host.Value; - string path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "Teaching Assistant Ultimate"); - var document = new HTMLDocument($"http://{req}/generate/{id}"); - //RenderSimplePdf(); - RenderAdvancedPdf(document); - //RenderMirrorPages(); - if (HybridSupport.IsElectronActive) - { - var window = await Electron.WindowManager.CreateWindowAsync(loadUrl: $"http://{req}/generate/{id}"); - } - return Ok(new { Message = "Document was saved to selected location" }); - } - - private static void RenderAdvancedPdf(Document document) - { - var width = Unit.FromMillimeters(297); - var height = Unit.FromMillimeters(420); - var pageSizeA3 = new Size(width, height); - - var margins = new Margin( - Unit.FromMillimeters(15), // left - Unit.FromMillimeters(10), // top - Unit.FromMillimeters(15), // right - Unit.FromMillimeters(20));// bottom - - var options = new PdfRenderingOptions - { - PageSetup = { AnyPage = new Page(pageSizeA3, margins) } - }; - const string outputfile = @"C:\Amin\output02.pdf"; - - Console.WriteLine("Render PDF file started..."); - var device = new PdfDevice(options, outputfile); - var renderer = new HtmlRenderer(); - renderer.Render(device, document); - Console.WriteLine("Render PDF file finished."); - } - } -} \ No newline at end of file diff --git a/TeachingAssistantUltimate/Controllers/QuestionsController.cs b/TeachingAssistantUltimate/Controllers/QuestionsController.cs index 44bcaad..c1c899a 100644 --- a/TeachingAssistantUltimate/Controllers/QuestionsController.cs +++ b/TeachingAssistantUltimate/Controllers/QuestionsController.cs @@ -6,9 +6,9 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using TeachingAssistant.Context; -using TeachingAssistant.Model; -using TeachingAssistant.Model.ViewModels; +using TeachingAssistantUltimate.Context; +using TeachingAssistantUltimate.Model; +using TeachingAssistantUltimate.Model.ViewModels; namespace CampusConnectApp.Controllers { diff --git a/TeachingAssistantUltimate/Controllers/ResultsController.cs b/TeachingAssistantUltimate/Controllers/ResultsController.cs new file mode 100644 index 0000000..4fe44f2 --- /dev/null +++ b/TeachingAssistantUltimate/Controllers/ResultsController.cs @@ -0,0 +1,158 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Expressions; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using TeachingAssistantUltimate.Context; +using TeachingAssistantUltimate.Model; +using TeachingAssistantUltimate.Model.ViewModels; + +namespace TeachingAssistantUltimate.Controllers +{ + public class ResultsController : Controller + { + private readonly DbContextOptions dco; + + public ResultsController(DbContextOptions options) => dco = options; + + [HttpGet] + public async Task ClassSubjects(short id) => await new ApplicationDbContext(dco).Results.Where(x => x.Students.ClassesID == id).Select(x => new { x.SubjectsID, x.Subjects.Subject, x.Subjects.SubjectCode }).Distinct().ToListAsync(); + + [HttpGet] + public async Task Tags(int cid) => await new ApplicationDbContext(dco).Results.Where(x => x.Students.ClassesID == cid).Select(x => new { x.Tag, x.AssessmentTypes.AssessmentType, x.AssessmentTypesID, x.TotalScore }).Distinct().ToListAsync(); + + [HttpGet] + public async Task TagResults(string tag, int cid, int sid) => await new ApplicationDbContext(dco).Results.Where(x => x.Tag == tag && x.Students.ClassesID == cid && x.SubjectsID == sid).Select(x => new + { + x.AssessmentTypes.AssessmentType, + x.AssessmentTypesID, + x.ResultsID, + x.Score, + x.Students.IndexNumber, + x.Students.Name, + x.StudentsID, + x.SubjectsID, + x.TotalScore, + x.Subjects.SubjectCode, + x.Subjects.Subject, + x.Tag + }).ToListAsync(); + + [HttpGet] + public async Task Find(int id) + { + var subj = await new ApplicationDbContext(dco).Results.Select(x => new + { + x.AssessmentTypes.AssessmentType, + x.AssessmentTypesID, + x.ResultsID, + x.Score, + x.Students.IndexNumber, + x.Students.Name, + x.StudentsID, + x.SubjectsID, + x.TotalScore, + x.Subjects.SubjectCode, + x.Subjects.Subject + }).SingleOrDefaultAsync(x => x.ResultsID == id); + if (subj == null) + return NotFound(); + return Ok(subj); + } + + [HttpGet] + public async Task List(int cid, int sid) + { + List disp = new List(); + List results = new List(); + using (var db = new ApplicationDbContext(dco)) + { + results = await db.Results.Where(x => x.Students.ClassesID == cid && x.SubjectsID == sid).Include(x => x.Students).Include(x => x.AssessmentTypes).ToListAsync(); + } + var types = results.Select(x => new { x.AssessmentTypes.AssessmentType, x.AssessmentTypesID, x.AssessmentTypes.Total }).Distinct(); + var stds = results.Select(x => x.Students).ToList(); + foreach (var std in stds.Distinct()) + { + var studentResults = new StudentResults + { + Name = std.Name, + IndexNumber = std.IndexNumber, + StudentsID = std.StudentsID, + Results = new List() + }; + foreach (var item in types) + { + var res = results.Where(x => x.StudentsID == std.StudentsID && x.AssessmentTypesID == item.AssessmentTypesID).GroupBy(x => new + { + x.AssessmentTypes.AssessmentType, + x.AssessmentTypesID, + }, (k, v) => new AssResults + { + AssessmentType = k.AssessmentType, + AssessmentTypesID = k.AssessmentTypesID, + SumScore = v.Sum(x => x.Score), + SumTotal = v.Sum(x => x.TotalScore), + AssessmentTotal = item.Total + + }).SingleOrDefault(); + studentResults.Results.Add(res); + } + disp.Add(studentResults); + } + + return Ok(new { results = disp.OrderBy(x => x.Name), types }); + } + + [HttpPost] + public async Task Create([FromBody]List results) + { + if (ModelState.IsValid) + { + using (var db = new ApplicationDbContext(dco)) + { + db.AddRange(results); + await db.SaveChangesAsync(); + return Created($"/Results/List", results); + } + } + return BadRequest(new { Error = "Invalid data was submitted", Message = ModelState.Values.First(x => x.Errors.Count > 0).Errors.Select(t => t.ErrorMessage).First() }); + } + + [HttpPost] + public async Task Edit([FromBody]Results results) + { + if (ModelState.IsValid) + { + using (var db = new ApplicationDbContext(dco)) + { + if (!await db.Results.AnyAsync(x => x.ResultsID == results.ResultsID)) + return BadRequest(new { Message = "No results was found matching the details provided" }); + db.Entry(results).State = EntityState.Modified; + await db.SaveChangesAsync(); + } + return Ok(results); + } + return BadRequest(new { Error = "Invalid data was submitted", Message = ModelState.Values.First(x => x.Errors.Count > 0).Errors.Select(t => t.ErrorMessage).First() }); + } + + [HttpPost] + public async Task Delete([FromBody]Subjects subject) + { + if (ModelState.IsValid) + { + using (var db = new ApplicationDbContext(dco)) + { + if (!await db.Subjects.AnyAsync(x => x.SubjectsID == subject.SubjectsID)) + return BadRequest(new { Message = "No results was found matching the details provided" }); + db.Entry(subject).State = EntityState.Deleted; + await db.SaveChangesAsync(); + } + return Ok(new { message = "Results deleted" }); + } + return BadRequest(new { Error = "Invalid data was submitted", Message = ModelState.Values.First(x => x.Errors.Count > 0).Errors.Select(t => t.ErrorMessage).First() }); + } + } +} \ No newline at end of file diff --git a/TeachingAssistantUltimate/Controllers/StudentsController.cs b/TeachingAssistantUltimate/Controllers/StudentsController.cs new file mode 100644 index 0000000..3495b4a --- /dev/null +++ b/TeachingAssistantUltimate/Controllers/StudentsController.cs @@ -0,0 +1,88 @@ +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using TeachingAssistantUltimate.Context; +using TeachingAssistantUltimate.Model; + +namespace TeachingAssistantUltimate.Controllers +{ + public class StudentsController : Controller + { + private readonly DbContextOptions dco; + + public StudentsController(DbContextOptions options) => dco = options; + + [HttpGet] + public async Task Find(int id) + { + var subj = await new ApplicationDbContext(dco).Students.Select(x => new + { + x.Classes.ClassName, + x.Name, + x.ClassesID, + x.StudentsID + }).SingleOrDefaultAsync(x => x.StudentsID == id); + if (subj == null) + return NotFound(); + return Ok(subj); + } + + [HttpGet] + public async Task List(int id) => await new ApplicationDbContext(dco).Students.Where(x => x.ClassesID == id).Select(x => new { x.Classes.ClassName, x.Name, x.ClassesID, x.StudentsID, x.IndexNumber }).ToListAsync(); + + + [HttpPost] + public async Task Create([FromBody]List stds) + { + if (ModelState.IsValid) + { + using (var db = new ApplicationDbContext(dco)) + { + if (await db.Students.Where(x => x.ClassesID == stds.First().ClassesID).AnyAsync(x => stds.Any(t => t.IndexNumber == x.IndexNumber))) + return BadRequest(new { Message = "Operation aborted because an index number was found already in the database" }); + db.AddRange(stds); + await db.SaveChangesAsync(); + return Created($"/Students/List/id={stds.First().ClassesID}", stds.OrderBy(x => x.IndexNumber)); + } + } + return BadRequest(new { Error = "Invalid data was submitted", Message = ModelState.Values.First(x => x.Errors.Count > 0).Errors.Select(t => t.ErrorMessage).First() }); + } + + [HttpPost] + public async Task Edit([FromBody]Students std) + { + if (ModelState.IsValid) + { + using (var db = new ApplicationDbContext(dco)) + { + if (!await db.Students.AnyAsync(x => x.StudentsID == std.StudentsID)) + return BadRequest(new { Message = "No student was found with details provided" }); + db.Entry(std).State = EntityState.Modified; + await db.SaveChangesAsync(); + } + return Ok(std); + } + return BadRequest(new { Error = "Invalid data was submitted", Message = ModelState.Values.First(x => x.Errors.Count > 0).Errors.Select(t => t.ErrorMessage).First() }); + } + + [HttpPost] + public async Task Delete([FromBody]Students std) + { + if (ModelState.IsValid) + { + using (var db = new ApplicationDbContext(dco)) + { + if (!await db.Students.AnyAsync(x => x.StudentsID == std.StudentsID)) + return BadRequest(new { Message = "No student was found with details provided" }); + db.Entry(std).State = EntityState.Deleted; + await db.SaveChangesAsync(); + } + return Ok(new { message = "Student removed from list" }); + } + return BadRequest(new { Error = "Invalid data was submitted", Message = ModelState.Values.First(x => x.Errors.Count > 0).Errors.Select(t => t.ErrorMessage).First() }); + } + } +} \ No newline at end of file diff --git a/TeachingAssistantUltimate/Controllers/SubjectsController.cs b/TeachingAssistantUltimate/Controllers/SubjectsController.cs index 7ae7a35..34a4d51 100644 --- a/TeachingAssistantUltimate/Controllers/SubjectsController.cs +++ b/TeachingAssistantUltimate/Controllers/SubjectsController.cs @@ -3,10 +3,10 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using TeachingAssistant.Context; -using TeachingAssistant.Model; +using TeachingAssistantUltimate.Context; +using TeachingAssistantUltimate.Model; -namespace TeachingAssistant.Controllers +namespace TeachingAssistantUltimate.Controllers { public class SubjectsController : Controller { @@ -22,6 +22,7 @@ public async Task Find(int id) x.SubjectsID, x.Questions.Count, x.Subject, + x.SubjectCode, x.Concurrency, Topics = x.Questions.Select(t => t.Topic).Distinct() }).SingleOrDefaultAsync(x => x.SubjectsID == id); @@ -31,11 +32,11 @@ public async Task Find(int id) } [HttpGet] - public async Task List(string id) + public async Task List() { using (var db = new ApplicationDbContext(dco)) { - return await db.Subjects.Select(x => new { x.Concurrency, x.Questions.Count, x.Subject, x.SubjectsID, Topics = x.Questions.Select(t => t.Topic).Distinct().ToList() }) + return await db.Subjects.Select(x => new { x.Concurrency, x.SubjectCode, x.Questions.Count, x.Subject, x.SubjectsID, Topics = x.Questions.Select(t => t.Topic).Distinct().ToList() }) .ToListAsync(); } } diff --git a/TeachingAssistantUltimate/Migrations/20180702220445_Initial.Designer.cs b/TeachingAssistantUltimate/Migrations/20180702220445_Initial.Designer.cs deleted file mode 100644 index 8ea19fb..0000000 --- a/TeachingAssistantUltimate/Migrations/20180702220445_Initial.Designer.cs +++ /dev/null @@ -1,114 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using TeachingAssistant.Context; - -namespace TeachingAssistantUltimate.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("20180702220445_Initial")] - partial class Initial - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "2.1.1-rtm-30846"); - - modelBuilder.Entity("TeachingAssistant.Model.Options", b => - { - b.Property("OptionsID") - .ValueGeneratedOnAdd(); - - b.Property("Concurrency") - .IsConcurrencyToken() - .ValueGeneratedOnAddOrUpdate(); - - b.Property("IsAnswer"); - - b.Property("Option") - .IsRequired() - .HasMaxLength(250); - - b.Property("QuestionsID"); - - b.HasKey("OptionsID"); - - b.HasIndex("QuestionsID"); - - b.ToTable("Options"); - }); - - modelBuilder.Entity("TeachingAssistant.Model.Questions", b => - { - b.Property("QuestionsID") - .ValueGeneratedOnAdd(); - - b.Property("Concurrency") - .IsConcurrencyToken() - .ValueGeneratedOnAddOrUpdate(); - - b.Property("DateAdded"); - - b.Property("Question") - .IsRequired() - .HasMaxLength(2147483647); - - b.Property("SubjectsID"); - - b.Property("Topic") - .IsRequired() - .HasMaxLength(200); - - b.HasKey("QuestionsID"); - - b.HasIndex("SubjectsID"); - - b.ToTable("Questions"); - }); - - modelBuilder.Entity("TeachingAssistant.Model.Subjects", b => - { - b.Property("SubjectsID") - .ValueGeneratedOnAdd(); - - b.Property("Concurrency") - .IsConcurrencyToken() - .ValueGeneratedOnAddOrUpdate(); - - b.Property("Subject") - .IsRequired() - .HasMaxLength(250); - - b.HasKey("SubjectsID"); - - b.ToTable("Subjects"); - - b.HasData( - new { SubjectsID = 1, Subject = "Public Health Nursing" }, - new { SubjectsID = 2, Subject = "Basic Infection Prevention and Control" } - ); - }); - - modelBuilder.Entity("TeachingAssistant.Model.Options", b => - { - b.HasOne("TeachingAssistant.Model.Questions", "Questions") - .WithMany("Options") - .HasForeignKey("QuestionsID") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("TeachingAssistant.Model.Questions", b => - { - b.HasOne("TeachingAssistant.Model.Subjects", "Subjects") - .WithMany("Questions") - .HasForeignKey("SubjectsID") - .OnDelete(DeleteBehavior.Cascade); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/TeachingAssistantUltimate/Migrations/20180702220445_Initial.cs b/TeachingAssistantUltimate/Migrations/20180702220445_Initial.cs deleted file mode 100644 index c577811..0000000 --- a/TeachingAssistantUltimate/Migrations/20180702220445_Initial.cs +++ /dev/null @@ -1,100 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace TeachingAssistantUltimate.Migrations -{ - public partial class Initial : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "Subjects", - columns: table => new - { - SubjectsID = table.Column(nullable: false) - .Annotation("Sqlite:Autoincrement", true), - Subject = table.Column(maxLength: 250, nullable: false), - Concurrency = table.Column(rowVersion: true, nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_Subjects", x => x.SubjectsID); - }); - - migrationBuilder.CreateTable( - name: "Questions", - columns: table => new - { - QuestionsID = table.Column(nullable: false), - Question = table.Column(maxLength: 2147483647, nullable: false), - Topic = table.Column(maxLength: 200, nullable: false), - SubjectsID = table.Column(nullable: false), - DateAdded = table.Column(nullable: false), - Concurrency = table.Column(rowVersion: true, nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_Questions", x => x.QuestionsID); - table.ForeignKey( - name: "FK_Questions_Subjects_SubjectsID", - column: x => x.SubjectsID, - principalTable: "Subjects", - principalColumn: "SubjectsID", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "Options", - columns: table => new - { - OptionsID = table.Column(nullable: false), - Option = table.Column(maxLength: 250, nullable: false), - QuestionsID = table.Column(nullable: false), - IsAnswer = table.Column(nullable: false), - Concurrency = table.Column(rowVersion: true, nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_Options", x => x.OptionsID); - table.ForeignKey( - name: "FK_Options_Questions_QuestionsID", - column: x => x.QuestionsID, - principalTable: "Questions", - principalColumn: "QuestionsID", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.InsertData( - table: "Subjects", - columns: new[] { "SubjectsID", "Concurrency", "Subject" }, - values: new object[] { 1, null, "Public Health Nursing" }); - - migrationBuilder.InsertData( - table: "Subjects", - columns: new[] { "SubjectsID", "Concurrency", "Subject" }, - values: new object[] { 2, null, "Basic Infection Prevention and Control" }); - - migrationBuilder.CreateIndex( - name: "IX_Options_QuestionsID", - table: "Options", - column: "QuestionsID"); - - migrationBuilder.CreateIndex( - name: "IX_Questions_SubjectsID", - table: "Questions", - column: "SubjectsID"); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "Options"); - - migrationBuilder.DropTable( - name: "Questions"); - - migrationBuilder.DropTable( - name: "Subjects"); - } - } -} diff --git a/TeachingAssistantUltimate/Migrations/20180705131130_IndexPadding.Designer.cs b/TeachingAssistantUltimate/Migrations/20180705131130_IndexPadding.Designer.cs new file mode 100644 index 0000000..e546e74 --- /dev/null +++ b/TeachingAssistantUltimate/Migrations/20180705131130_IndexPadding.Designer.cs @@ -0,0 +1,237 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using TeachingAssistantUltimate.Context; + +namespace TeachingAssistantUltimate.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + [Migration("20180705131130_IndexPadding")] + partial class IndexPadding + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "2.1.1-rtm-30846"); + + modelBuilder.Entity("TeachingAssistantUltimate.Model.AssessmentTypes", b => + { + b.Property("AssessmentTypesID") + .ValueGeneratedOnAdd(); + + b.Property("AssessmentType") + .IsRequired() + .HasMaxLength(15); + + b.Property("Total"); + + b.HasKey("AssessmentTypesID"); + + b.ToTable("AssessmentTypes"); + + b.HasData( + new { AssessmentTypesID = (short)1, AssessmentType = "Quiz", Total = 10.0 }, + new { AssessmentTypesID = (short)2, AssessmentType = "Assignment", Total = 10.0 }, + new { AssessmentTypesID = (short)3, AssessmentType = "Mid-Sem", Total = 20.0 } + ); + }); + + modelBuilder.Entity("TeachingAssistantUltimate.Model.Classes", b => + { + b.Property("ClassesID") + .ValueGeneratedOnAdd(); + + b.Property("ClassName") + .IsRequired() + .HasMaxLength(10); + + b.Property("Concurrency") + .IsConcurrencyToken() + .ValueGeneratedOnAddOrUpdate(); + + b.Property("IndexPrefix") + .IsRequired() + .HasMaxLength(20); + + b.Property("Padding"); + + b.HasKey("ClassesID"); + + b.ToTable("Classes"); + }); + + modelBuilder.Entity("TeachingAssistantUltimate.Model.Options", b => + { + b.Property("OptionsID") + .ValueGeneratedOnAdd(); + + b.Property("Concurrency") + .IsConcurrencyToken() + .ValueGeneratedOnAddOrUpdate(); + + b.Property("IsAnswer"); + + b.Property("Option") + .IsRequired() + .HasMaxLength(250); + + b.Property("QuestionsID"); + + b.HasKey("OptionsID"); + + b.HasIndex("QuestionsID"); + + b.ToTable("Options"); + }); + + modelBuilder.Entity("TeachingAssistantUltimate.Model.Questions", b => + { + b.Property("QuestionsID") + .ValueGeneratedOnAdd(); + + b.Property("Concurrency") + .IsConcurrencyToken() + .ValueGeneratedOnAddOrUpdate(); + + b.Property("DateAdded"); + + b.Property("Question") + .IsRequired() + .HasMaxLength(2147483647); + + b.Property("SubjectsID"); + + b.Property("Topic") + .IsRequired() + .HasMaxLength(200); + + b.HasKey("QuestionsID"); + + b.HasIndex("SubjectsID"); + + b.ToTable("Questions"); + }); + + modelBuilder.Entity("TeachingAssistantUltimate.Model.Results", b => + { + b.Property("ResultsID") + .ValueGeneratedOnAdd(); + + b.Property("AssessmentTypesID"); + + b.Property("Score"); + + b.Property("StudentsID"); + + b.Property("SubjectsID"); + + b.Property("TotalScore"); + + b.HasKey("ResultsID"); + + b.HasIndex("AssessmentTypesID"); + + b.HasIndex("StudentsID"); + + b.HasIndex("SubjectsID"); + + b.ToTable("Results"); + }); + + modelBuilder.Entity("TeachingAssistantUltimate.Model.Students", b => + { + b.Property("StudentsID") + .ValueGeneratedOnAdd(); + + b.Property("ClassesID"); + + b.Property("IndexNumber") + .IsRequired(); + + b.Property("Name") + .IsRequired() + .HasMaxLength(100); + + b.HasKey("StudentsID"); + + b.HasIndex("ClassesID"); + + b.ToTable("Students"); + }); + + modelBuilder.Entity("TeachingAssistantUltimate.Model.Subjects", b => + { + b.Property("SubjectsID") + .ValueGeneratedOnAdd(); + + b.Property("Concurrency") + .IsConcurrencyToken() + .ValueGeneratedOnAddOrUpdate(); + + b.Property("Subject") + .IsRequired() + .HasMaxLength(250); + + b.Property("SubjectCode") + .IsRequired() + .HasMaxLength(10); + + b.HasKey("SubjectsID"); + + b.ToTable("Subjects"); + + b.HasData( + new { SubjectsID = 1, Subject = "Public Health Nursing", SubjectCode = "001" }, + new { SubjectsID = 2, Subject = "Basic Infection Prevention and Control", SubjectCode = "002" } + ); + }); + + modelBuilder.Entity("TeachingAssistantUltimate.Model.Options", b => + { + b.HasOne("TeachingAssistantUltimate.Model.Questions", "Questions") + .WithMany("Options") + .HasForeignKey("QuestionsID") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("TeachingAssistantUltimate.Model.Questions", b => + { + b.HasOne("TeachingAssistantUltimate.Model.Subjects", "Subjects") + .WithMany("Questions") + .HasForeignKey("SubjectsID") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("TeachingAssistantUltimate.Model.Results", b => + { + b.HasOne("TeachingAssistantUltimate.Model.AssessmentTypes", "AssessmentTypes") + .WithMany("Results") + .HasForeignKey("AssessmentTypesID") + .OnDelete(DeleteBehavior.Cascade); + + b.HasOne("TeachingAssistantUltimate.Model.Students", "Students") + .WithMany("Results") + .HasForeignKey("StudentsID") + .OnDelete(DeleteBehavior.Cascade); + + b.HasOne("TeachingAssistantUltimate.Model.Subjects", "Subjects") + .WithMany("Results") + .HasForeignKey("SubjectsID") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("TeachingAssistantUltimate.Model.Students", b => + { + b.HasOne("TeachingAssistantUltimate.Model.Classes", "Classes") + .WithMany("Students") + .HasForeignKey("ClassesID") + .OnDelete(DeleteBehavior.Cascade); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/TeachingAssistantUltimate/Migrations/20180705131130_IndexPadding.cs b/TeachingAssistantUltimate/Migrations/20180705131130_IndexPadding.cs new file mode 100644 index 0000000..87e3e71 --- /dev/null +++ b/TeachingAssistantUltimate/Migrations/20180705131130_IndexPadding.cs @@ -0,0 +1,234 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace TeachingAssistantUltimate.Migrations +{ + public partial class IndexPadding : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "AssessmentTypes", + columns: table => new + { + AssessmentTypesID = table.Column(nullable: false) + .Annotation("Sqlite:Autoincrement", true), + AssessmentType = table.Column(maxLength: 15, nullable: false), + Total = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AssessmentTypes", x => x.AssessmentTypesID); + }); + + migrationBuilder.CreateTable( + name: "Classes", + columns: table => new + { + ClassesID = table.Column(nullable: false) + .Annotation("Sqlite:Autoincrement", true), + ClassName = table.Column(maxLength: 10, nullable: false), + IndexPrefix = table.Column(maxLength: 20, nullable: false), + Padding = table.Column(nullable: false), + Concurrency = table.Column(rowVersion: true, nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_Classes", x => x.ClassesID); + }); + + migrationBuilder.CreateTable( + name: "Subjects", + columns: table => new + { + SubjectsID = table.Column(nullable: false) + .Annotation("Sqlite:Autoincrement", true), + Subject = table.Column(maxLength: 250, nullable: false), + SubjectCode = table.Column(maxLength: 10, nullable: false), + Concurrency = table.Column(rowVersion: true, nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_Subjects", x => x.SubjectsID); + }); + + migrationBuilder.CreateTable( + name: "Students", + columns: table => new + { + StudentsID = table.Column(nullable: false) + .Annotation("Sqlite:Autoincrement", true), + Name = table.Column(maxLength: 100, nullable: false), + IndexNumber = table.Column(nullable: false), + ClassesID = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Students", x => x.StudentsID); + table.ForeignKey( + name: "FK_Students_Classes_ClassesID", + column: x => x.ClassesID, + principalTable: "Classes", + principalColumn: "ClassesID", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "Questions", + columns: table => new + { + QuestionsID = table.Column(nullable: false), + Question = table.Column(maxLength: 2147483647, nullable: false), + Topic = table.Column(maxLength: 200, nullable: false), + SubjectsID = table.Column(nullable: false), + DateAdded = table.Column(nullable: false), + Concurrency = table.Column(rowVersion: true, nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_Questions", x => x.QuestionsID); + table.ForeignKey( + name: "FK_Questions_Subjects_SubjectsID", + column: x => x.SubjectsID, + principalTable: "Subjects", + principalColumn: "SubjectsID", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "Results", + columns: table => new + { + ResultsID = table.Column(nullable: false) + .Annotation("Sqlite:Autoincrement", true), + StudentsID = table.Column(nullable: false), + SubjectsID = table.Column(nullable: false), + AssessmentTypesID = table.Column(nullable: false), + Score = table.Column(nullable: false), + TotalScore = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Results", x => x.ResultsID); + table.ForeignKey( + name: "FK_Results_AssessmentTypes_AssessmentTypesID", + column: x => x.AssessmentTypesID, + principalTable: "AssessmentTypes", + principalColumn: "AssessmentTypesID", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_Results_Students_StudentsID", + column: x => x.StudentsID, + principalTable: "Students", + principalColumn: "StudentsID", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_Results_Subjects_SubjectsID", + column: x => x.SubjectsID, + principalTable: "Subjects", + principalColumn: "SubjectsID", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "Options", + columns: table => new + { + OptionsID = table.Column(nullable: false), + Option = table.Column(maxLength: 250, nullable: false), + QuestionsID = table.Column(nullable: false), + IsAnswer = table.Column(nullable: false), + Concurrency = table.Column(rowVersion: true, nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_Options", x => x.OptionsID); + table.ForeignKey( + name: "FK_Options_Questions_QuestionsID", + column: x => x.QuestionsID, + principalTable: "Questions", + principalColumn: "QuestionsID", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.InsertData( + table: "AssessmentTypes", + columns: new[] { "AssessmentTypesID", "AssessmentType", "Total" }, + values: new object[] { (short)1, "Quiz", 10.0 }); + + migrationBuilder.InsertData( + table: "AssessmentTypes", + columns: new[] { "AssessmentTypesID", "AssessmentType", "Total" }, + values: new object[] { (short)2, "Assignment", 10.0 }); + + migrationBuilder.InsertData( + table: "AssessmentTypes", + columns: new[] { "AssessmentTypesID", "AssessmentType", "Total" }, + values: new object[] { (short)3, "Mid-Sem", 20.0 }); + + migrationBuilder.InsertData( + table: "Subjects", + columns: new[] { "SubjectsID", "Concurrency", "Subject", "SubjectCode" }, + values: new object[] { 1, null, "Public Health Nursing", "001" }); + + migrationBuilder.InsertData( + table: "Subjects", + columns: new[] { "SubjectsID", "Concurrency", "Subject", "SubjectCode" }, + values: new object[] { 2, null, "Basic Infection Prevention and Control", "002" }); + + migrationBuilder.CreateIndex( + name: "IX_Options_QuestionsID", + table: "Options", + column: "QuestionsID"); + + migrationBuilder.CreateIndex( + name: "IX_Questions_SubjectsID", + table: "Questions", + column: "SubjectsID"); + + migrationBuilder.CreateIndex( + name: "IX_Results_AssessmentTypesID", + table: "Results", + column: "AssessmentTypesID"); + + migrationBuilder.CreateIndex( + name: "IX_Results_StudentsID", + table: "Results", + column: "StudentsID"); + + migrationBuilder.CreateIndex( + name: "IX_Results_SubjectsID", + table: "Results", + column: "SubjectsID"); + + migrationBuilder.CreateIndex( + name: "IX_Students_ClassesID", + table: "Students", + column: "ClassesID"); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "Options"); + + migrationBuilder.DropTable( + name: "Results"); + + migrationBuilder.DropTable( + name: "Questions"); + + migrationBuilder.DropTable( + name: "AssessmentTypes"); + + migrationBuilder.DropTable( + name: "Students"); + + migrationBuilder.DropTable( + name: "Subjects"); + + migrationBuilder.DropTable( + name: "Classes"); + } + } +} diff --git a/TeachingAssistantUltimate/Migrations/20180706121250_ResultsTAGS.Designer.cs b/TeachingAssistantUltimate/Migrations/20180706121250_ResultsTAGS.Designer.cs new file mode 100644 index 0000000..4095b63 --- /dev/null +++ b/TeachingAssistantUltimate/Migrations/20180706121250_ResultsTAGS.Designer.cs @@ -0,0 +1,241 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using TeachingAssistantUltimate.Context; + +namespace TeachingAssistantUltimate.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + [Migration("20180706121250_ResultsTAGS")] + partial class ResultsTAGS + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "2.1.1-rtm-30846"); + + modelBuilder.Entity("TeachingAssistantUltimate.Model.AssessmentTypes", b => + { + b.Property("AssessmentTypesID") + .ValueGeneratedOnAdd(); + + b.Property("AssessmentType") + .IsRequired() + .HasMaxLength(15); + + b.Property("Total"); + + b.HasKey("AssessmentTypesID"); + + b.ToTable("AssessmentTypes"); + + b.HasData( + new { AssessmentTypesID = (short)1, AssessmentType = "Quiz", Total = 10.0 }, + new { AssessmentTypesID = (short)2, AssessmentType = "Assignment", Total = 10.0 }, + new { AssessmentTypesID = (short)3, AssessmentType = "Mid-Sem", Total = 20.0 } + ); + }); + + modelBuilder.Entity("TeachingAssistantUltimate.Model.Classes", b => + { + b.Property("ClassesID") + .ValueGeneratedOnAdd(); + + b.Property("ClassName") + .IsRequired() + .HasMaxLength(10); + + b.Property("Concurrency") + .IsConcurrencyToken() + .ValueGeneratedOnAddOrUpdate(); + + b.Property("IndexPrefix") + .IsRequired() + .HasMaxLength(20); + + b.Property("Padding"); + + b.HasKey("ClassesID"); + + b.ToTable("Classes"); + }); + + modelBuilder.Entity("TeachingAssistantUltimate.Model.Options", b => + { + b.Property("OptionsID") + .ValueGeneratedOnAdd(); + + b.Property("Concurrency") + .IsConcurrencyToken() + .ValueGeneratedOnAddOrUpdate(); + + b.Property("IsAnswer"); + + b.Property("Option") + .IsRequired() + .HasMaxLength(250); + + b.Property("QuestionsID"); + + b.HasKey("OptionsID"); + + b.HasIndex("QuestionsID"); + + b.ToTable("Options"); + }); + + modelBuilder.Entity("TeachingAssistantUltimate.Model.Questions", b => + { + b.Property("QuestionsID") + .ValueGeneratedOnAdd(); + + b.Property("Concurrency") + .IsConcurrencyToken() + .ValueGeneratedOnAddOrUpdate(); + + b.Property("DateAdded"); + + b.Property("Question") + .IsRequired() + .HasMaxLength(2147483647); + + b.Property("SubjectsID"); + + b.Property("Topic") + .IsRequired() + .HasMaxLength(200); + + b.HasKey("QuestionsID"); + + b.HasIndex("SubjectsID"); + + b.ToTable("Questions"); + }); + + modelBuilder.Entity("TeachingAssistantUltimate.Model.Results", b => + { + b.Property("ResultsID") + .ValueGeneratedOnAdd(); + + b.Property("AssessmentTypesID"); + + b.Property("Score"); + + b.Property("StudentsID"); + + b.Property("SubjectsID"); + + b.Property("Tag") + .IsRequired() + .HasMaxLength(20); + + b.Property("TotalScore"); + + b.HasKey("ResultsID"); + + b.HasIndex("AssessmentTypesID"); + + b.HasIndex("StudentsID"); + + b.HasIndex("SubjectsID"); + + b.ToTable("Results"); + }); + + modelBuilder.Entity("TeachingAssistantUltimate.Model.Students", b => + { + b.Property("StudentsID") + .ValueGeneratedOnAdd(); + + b.Property("ClassesID"); + + b.Property("IndexNumber") + .IsRequired(); + + b.Property("Name") + .IsRequired() + .HasMaxLength(100); + + b.HasKey("StudentsID"); + + b.HasIndex("ClassesID"); + + b.ToTable("Students"); + }); + + modelBuilder.Entity("TeachingAssistantUltimate.Model.Subjects", b => + { + b.Property("SubjectsID") + .ValueGeneratedOnAdd(); + + b.Property("Concurrency") + .IsConcurrencyToken() + .ValueGeneratedOnAddOrUpdate(); + + b.Property("Subject") + .IsRequired() + .HasMaxLength(250); + + b.Property("SubjectCode") + .IsRequired() + .HasMaxLength(10); + + b.HasKey("SubjectsID"); + + b.ToTable("Subjects"); + + b.HasData( + new { SubjectsID = 1, Subject = "Public Health Nursing", SubjectCode = "001" }, + new { SubjectsID = 2, Subject = "Basic Infection Prevention and Control", SubjectCode = "002" } + ); + }); + + modelBuilder.Entity("TeachingAssistantUltimate.Model.Options", b => + { + b.HasOne("TeachingAssistantUltimate.Model.Questions", "Questions") + .WithMany("Options") + .HasForeignKey("QuestionsID") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("TeachingAssistantUltimate.Model.Questions", b => + { + b.HasOne("TeachingAssistantUltimate.Model.Subjects", "Subjects") + .WithMany("Questions") + .HasForeignKey("SubjectsID") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("TeachingAssistantUltimate.Model.Results", b => + { + b.HasOne("TeachingAssistantUltimate.Model.AssessmentTypes", "AssessmentTypes") + .WithMany("Results") + .HasForeignKey("AssessmentTypesID") + .OnDelete(DeleteBehavior.Cascade); + + b.HasOne("TeachingAssistantUltimate.Model.Students", "Students") + .WithMany("Results") + .HasForeignKey("StudentsID") + .OnDelete(DeleteBehavior.Cascade); + + b.HasOne("TeachingAssistantUltimate.Model.Subjects", "Subjects") + .WithMany("Results") + .HasForeignKey("SubjectsID") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("TeachingAssistantUltimate.Model.Students", b => + { + b.HasOne("TeachingAssistantUltimate.Model.Classes", "Classes") + .WithMany("Students") + .HasForeignKey("ClassesID") + .OnDelete(DeleteBehavior.Cascade); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/TeachingAssistantUltimate/Migrations/20180706121250_ResultsTAGS.cs b/TeachingAssistantUltimate/Migrations/20180706121250_ResultsTAGS.cs new file mode 100644 index 0000000..88fca21 --- /dev/null +++ b/TeachingAssistantUltimate/Migrations/20180706121250_ResultsTAGS.cs @@ -0,0 +1,24 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +namespace TeachingAssistantUltimate.Migrations +{ + public partial class ResultsTAGS : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "Tag", + table: "Results", + maxLength: 20, + nullable: false, + defaultValue: ""); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "Tag", + table: "Results"); + } + } +} diff --git a/TeachingAssistantUltimate/Migrations/ApplicationDbContextModelSnapshot.cs b/TeachingAssistantUltimate/Migrations/ApplicationDbContextModelSnapshot.cs index 83293fb..75f3882 100644 --- a/TeachingAssistantUltimate/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/TeachingAssistantUltimate/Migrations/ApplicationDbContextModelSnapshot.cs @@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using TeachingAssistant.Context; +using TeachingAssistantUltimate.Context; namespace TeachingAssistantUltimate.Migrations { @@ -16,7 +16,53 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder .HasAnnotation("ProductVersion", "2.1.1-rtm-30846"); - modelBuilder.Entity("TeachingAssistant.Model.Options", b => + modelBuilder.Entity("TeachingAssistantUltimate.Model.AssessmentTypes", b => + { + b.Property("AssessmentTypesID") + .ValueGeneratedOnAdd(); + + b.Property("AssessmentType") + .IsRequired() + .HasMaxLength(15); + + b.Property("Total"); + + b.HasKey("AssessmentTypesID"); + + b.ToTable("AssessmentTypes"); + + b.HasData( + new { AssessmentTypesID = (short)1, AssessmentType = "Quiz", Total = 10.0 }, + new { AssessmentTypesID = (short)2, AssessmentType = "Assignment", Total = 10.0 }, + new { AssessmentTypesID = (short)3, AssessmentType = "Mid-Sem", Total = 20.0 } + ); + }); + + modelBuilder.Entity("TeachingAssistantUltimate.Model.Classes", b => + { + b.Property("ClassesID") + .ValueGeneratedOnAdd(); + + b.Property("ClassName") + .IsRequired() + .HasMaxLength(10); + + b.Property("Concurrency") + .IsConcurrencyToken() + .ValueGeneratedOnAddOrUpdate(); + + b.Property("IndexPrefix") + .IsRequired() + .HasMaxLength(20); + + b.Property("Padding"); + + b.HasKey("ClassesID"); + + b.ToTable("Classes"); + }); + + modelBuilder.Entity("TeachingAssistantUltimate.Model.Options", b => { b.Property("OptionsID") .ValueGeneratedOnAdd(); @@ -40,7 +86,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("Options"); }); - modelBuilder.Entity("TeachingAssistant.Model.Questions", b => + modelBuilder.Entity("TeachingAssistantUltimate.Model.Questions", b => { b.Property("QuestionsID") .ValueGeneratedOnAdd(); @@ -68,7 +114,58 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("Questions"); }); - modelBuilder.Entity("TeachingAssistant.Model.Subjects", b => + modelBuilder.Entity("TeachingAssistantUltimate.Model.Results", b => + { + b.Property("ResultsID") + .ValueGeneratedOnAdd(); + + b.Property("AssessmentTypesID"); + + b.Property("Score"); + + b.Property("StudentsID"); + + b.Property("SubjectsID"); + + b.Property("Tag") + .IsRequired() + .HasMaxLength(20); + + b.Property("TotalScore"); + + b.HasKey("ResultsID"); + + b.HasIndex("AssessmentTypesID"); + + b.HasIndex("StudentsID"); + + b.HasIndex("SubjectsID"); + + b.ToTable("Results"); + }); + + modelBuilder.Entity("TeachingAssistantUltimate.Model.Students", b => + { + b.Property("StudentsID") + .ValueGeneratedOnAdd(); + + b.Property("ClassesID"); + + b.Property("IndexNumber") + .IsRequired(); + + b.Property("Name") + .IsRequired() + .HasMaxLength(100); + + b.HasKey("StudentsID"); + + b.HasIndex("ClassesID"); + + b.ToTable("Students"); + }); + + modelBuilder.Entity("TeachingAssistantUltimate.Model.Subjects", b => { b.Property("SubjectsID") .ValueGeneratedOnAdd(); @@ -81,31 +178,61 @@ protected override void BuildModel(ModelBuilder modelBuilder) .IsRequired() .HasMaxLength(250); + b.Property("SubjectCode") + .IsRequired() + .HasMaxLength(10); + b.HasKey("SubjectsID"); b.ToTable("Subjects"); b.HasData( - new { SubjectsID = 1, Subject = "Public Health Nursing" }, - new { SubjectsID = 2, Subject = "Basic Infection Prevention and Control" } + new { SubjectsID = 1, Subject = "Public Health Nursing", SubjectCode = "001" }, + new { SubjectsID = 2, Subject = "Basic Infection Prevention and Control", SubjectCode = "002" } ); }); - modelBuilder.Entity("TeachingAssistant.Model.Options", b => + modelBuilder.Entity("TeachingAssistantUltimate.Model.Options", b => { - b.HasOne("TeachingAssistant.Model.Questions", "Questions") + b.HasOne("TeachingAssistantUltimate.Model.Questions", "Questions") .WithMany("Options") .HasForeignKey("QuestionsID") .OnDelete(DeleteBehavior.Cascade); }); - modelBuilder.Entity("TeachingAssistant.Model.Questions", b => + modelBuilder.Entity("TeachingAssistantUltimate.Model.Questions", b => { - b.HasOne("TeachingAssistant.Model.Subjects", "Subjects") + b.HasOne("TeachingAssistantUltimate.Model.Subjects", "Subjects") .WithMany("Questions") .HasForeignKey("SubjectsID") .OnDelete(DeleteBehavior.Cascade); }); + + modelBuilder.Entity("TeachingAssistantUltimate.Model.Results", b => + { + b.HasOne("TeachingAssistantUltimate.Model.AssessmentTypes", "AssessmentTypes") + .WithMany("Results") + .HasForeignKey("AssessmentTypesID") + .OnDelete(DeleteBehavior.Cascade); + + b.HasOne("TeachingAssistantUltimate.Model.Students", "Students") + .WithMany("Results") + .HasForeignKey("StudentsID") + .OnDelete(DeleteBehavior.Cascade); + + b.HasOne("TeachingAssistantUltimate.Model.Subjects", "Subjects") + .WithMany("Results") + .HasForeignKey("SubjectsID") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("TeachingAssistantUltimate.Model.Students", b => + { + b.HasOne("TeachingAssistantUltimate.Model.Classes", "Classes") + .WithMany("Students") + .HasForeignKey("ClassesID") + .OnDelete(DeleteBehavior.Cascade); + }); #pragma warning restore 612, 618 } } diff --git a/TeachingAssistantUltimate/Model/AssessTypes.cs b/TeachingAssistantUltimate/Model/AssessTypes.cs new file mode 100644 index 0000000..fe999f1 --- /dev/null +++ b/TeachingAssistantUltimate/Model/AssessTypes.cs @@ -0,0 +1,20 @@ +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; + +namespace TeachingAssistantUltimate.Model +{ + public class AssessmentTypes + { + [Key] + public short AssessmentTypesID { get; set; } + + [Required, StringLength(15, MinimumLength = 3)] + public string AssessmentType { get; set; } + + [Required] + [Range(5, 70)] + public double Total { get; set; } + + public virtual ICollection Results { get; set; } + } +} diff --git a/TeachingAssistantUltimate/Model/Classes.cs b/TeachingAssistantUltimate/Model/Classes.cs new file mode 100644 index 0000000..d782c8f --- /dev/null +++ b/TeachingAssistantUltimate/Model/Classes.cs @@ -0,0 +1,27 @@ +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; + +namespace TeachingAssistantUltimate.Model +{ + public class Classes + { + [Key] + public short ClassesID { get; set; } + + [Required, StringLength(10, MinimumLength = 3)] + public string ClassName { get; set; } + + [Required, StringLength(20, MinimumLength = 3)] + public string IndexPrefix { get; set; } + + [Required] + [DefaultValue(0)] + public byte Padding { get; set; } + + [Timestamp, ConcurrencyCheck] + public byte[] Concurrency { get; set; } + + public virtual ICollection Students { get; set; } + } +} diff --git a/TeachingAssistantUltimate/Model/Options.cs b/TeachingAssistantUltimate/Model/Options.cs index f7fd039..57ef911 100644 --- a/TeachingAssistantUltimate/Model/Options.cs +++ b/TeachingAssistantUltimate/Model/Options.cs @@ -2,7 +2,7 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace TeachingAssistant.Model +namespace TeachingAssistantUltimate.Model { public class Options { diff --git a/TeachingAssistantUltimate/Model/Questions.cs b/TeachingAssistantUltimate/Model/Questions.cs index 69d16d0..80d5e53 100644 --- a/TeachingAssistantUltimate/Model/Questions.cs +++ b/TeachingAssistantUltimate/Model/Questions.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace TeachingAssistant.Model +namespace TeachingAssistantUltimate.Model { public class Questions { diff --git a/TeachingAssistantUltimate/Model/Results.cs b/TeachingAssistantUltimate/Model/Results.cs new file mode 100644 index 0000000..ec2639f --- /dev/null +++ b/TeachingAssistantUltimate/Model/Results.cs @@ -0,0 +1,37 @@ +using System.ComponentModel.DataAnnotations; + +namespace TeachingAssistantUltimate.Model +{ + public class Results + { + [Key] + public int ResultsID { get; set; } + + [Required] + public int StudentsID { get; set; } + + [Required] + public int SubjectsID { get; set; } + + [Required] + public short AssessmentTypesID { get; set; } + + [Required] + [Range(0, 100)] + public double Score { get; set; } + + [Required] + [Range(1, 100)] + public double TotalScore { get; set; } + + [Required] + [StringLength(20,MinimumLength =3)] + public string Tag { get; set; } + + public virtual Students Students { get; set; } + + public virtual AssessmentTypes AssessmentTypes { get; set; } + + public virtual Subjects Subjects { get; set; } + } +} diff --git a/TeachingAssistantUltimate/Model/Students.cs b/TeachingAssistantUltimate/Model/Students.cs new file mode 100644 index 0000000..7d4d3d0 --- /dev/null +++ b/TeachingAssistantUltimate/Model/Students.cs @@ -0,0 +1,24 @@ +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; + +namespace TeachingAssistantUltimate.Model +{ + public class Students + { + [Key] + public int StudentsID { get; set; } + + [Required, StringLength(100, MinimumLength = 5)] + public string Name { get; set; } + + [Required] + public string IndexNumber { get; set; } + + [Required] + public short ClassesID { get; set; } + + public virtual Classes Classes { get; set; } + + public virtual ICollection Results { get; set; } + } +} diff --git a/TeachingAssistantUltimate/Model/Subjects.cs b/TeachingAssistantUltimate/Model/Subjects.cs index 2b89c5e..a397a1c 100644 --- a/TeachingAssistantUltimate/Model/Subjects.cs +++ b/TeachingAssistantUltimate/Model/Subjects.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace TeachingAssistant.Model +namespace TeachingAssistantUltimate.Model { public class Subjects { @@ -11,9 +11,15 @@ public class Subjects [StringLength(250, MinimumLength = 5)] public string Subject { get; set; } + [Required] + [StringLength(10, MinimumLength = 3)] + public string SubjectCode { get; set; } + [Timestamp, ConcurrencyCheck] public byte[] Concurrency { get; set; } public virtual ICollection Questions { get; set; } + + public virtual ICollection Results { get; set; } } } diff --git a/TeachingAssistantUltimate/Model/TransactionResponse.cs b/TeachingAssistantUltimate/Model/TransactionResponse.cs index ce891a2..a1b2a47 100644 --- a/TeachingAssistantUltimate/Model/TransactionResponse.cs +++ b/TeachingAssistantUltimate/Model/TransactionResponse.cs @@ -1,4 +1,4 @@ -namespace TeachingAssistant.Model +namespace TeachingAssistantUltimate.Model { public class TransactionResponse { diff --git a/TeachingAssistantUltimate/Model/ViewModels/AssResults.cs b/TeachingAssistantUltimate/Model/ViewModels/AssResults.cs new file mode 100644 index 0000000..1e1cd39 --- /dev/null +++ b/TeachingAssistantUltimate/Model/ViewModels/AssResults.cs @@ -0,0 +1,11 @@ +namespace TeachingAssistantUltimate.Model.ViewModels +{ + public class AssResults + { + public string AssessmentType { get; set; } + public int AssessmentTypesID { get; set; } + public double SumScore { get; set; } + public double SumTotal { get; set; } + public double AssessmentTotal { get; set; } + } +} diff --git a/TeachingAssistantUltimate/Model/ViewModels/GeneratorVm.cs b/TeachingAssistantUltimate/Model/ViewModels/GeneratorVm.cs index 657aafa..7f7206d 100644 --- a/TeachingAssistantUltimate/Model/ViewModels/GeneratorVm.cs +++ b/TeachingAssistantUltimate/Model/ViewModels/GeneratorVm.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace TeachingAssistant.Model.ViewModels +namespace TeachingAssistantUltimate.Model.ViewModels { public class GeneratorVm { diff --git a/TeachingAssistantUltimate/Model/ViewModels/GetQuestionsVm.cs b/TeachingAssistantUltimate/Model/ViewModels/GetQuestionsVm.cs index d4f8956..ef72f0a 100644 --- a/TeachingAssistantUltimate/Model/ViewModels/GetQuestionsVm.cs +++ b/TeachingAssistantUltimate/Model/ViewModels/GetQuestionsVm.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace TeachingAssistant.Model.ViewModels +namespace TeachingAssistantUltimate.Model.ViewModels { public class GetQuestionsVm { diff --git a/TeachingAssistantUltimate/Model/ViewModels/ResultsDisplayVm.cs b/TeachingAssistantUltimate/Model/ViewModels/ResultsDisplayVm.cs new file mode 100644 index 0000000..56a31ee --- /dev/null +++ b/TeachingAssistantUltimate/Model/ViewModels/ResultsDisplayVm.cs @@ -0,0 +1,23 @@ +namespace TeachingAssistantUltimate.Model.ViewModels +{ + public class ResultsDisplayVm + { + public int StudentsID { get; set; } + + public string Name { get; set; } + + public int AssessmentTypesID { get; set; } + + public string AssessmentType { get; set; } + + public double SumScore { get; set; } + + public double SumTotal { get; set; } + + public double Total { get; set; } + + public double Score => SumScore / SumTotal; + + public double ConvertedScore => Score * Total; + } +} diff --git a/TeachingAssistantUltimate/Model/ViewModels/StudentResults.cs b/TeachingAssistantUltimate/Model/ViewModels/StudentResults.cs new file mode 100644 index 0000000..f2f8efe --- /dev/null +++ b/TeachingAssistantUltimate/Model/ViewModels/StudentResults.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace TeachingAssistantUltimate.Model.ViewModels +{ + public class StudentResults + { + public int StudentsID { get; set; } + + public string Name { get; set; } + + public List Results { get; set; } + + public double AssessValue { get; set; } + public string IndexNumber { get; internal set; } + } +} diff --git a/TeachingAssistantUltimate/Model/ViewModels/TestVm.cs b/TeachingAssistantUltimate/Model/ViewModels/TestVm.cs index 9b13800..9878723 100644 --- a/TeachingAssistantUltimate/Model/ViewModels/TestVm.cs +++ b/TeachingAssistantUltimate/Model/ViewModels/TestVm.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace TeachingAssistant.Model.ViewModels +namespace TeachingAssistantUltimate.Model.ViewModels { public class TestVm { diff --git a/TeachingAssistantUltimate/Model/ViewModels/TopicsVm.cs b/TeachingAssistantUltimate/Model/ViewModels/TopicsVm.cs index 6bf8368..d66011e 100644 --- a/TeachingAssistantUltimate/Model/ViewModels/TopicsVm.cs +++ b/TeachingAssistantUltimate/Model/ViewModels/TopicsVm.cs @@ -1,4 +1,4 @@ -namespace TeachingAssistant.Model.ViewModels +namespace TeachingAssistantUltimate.Model.ViewModels { //public class TopicsVm //{ diff --git a/TeachingAssistantUltimate/Program.cs b/TeachingAssistantUltimate/Program.cs index 83e708e..2005fad 100644 --- a/TeachingAssistantUltimate/Program.cs +++ b/TeachingAssistantUltimate/Program.cs @@ -9,7 +9,7 @@ public class Program { public static void Main(string[] args) { - if (DateTime.Now.Date > DateTime.Parse("July 14, 2018").Date) + if (DateTime.Now.Date > DateTime.Parse("December 31, 2018").Date) throw new Exception("Evaluation Period is over"); BuildWebHost(args).Run(); } diff --git a/TeachingAssistantUltimate/READ ME.md b/TeachingAssistantUltimate/READ ME.md new file mode 100644 index 0000000..67e3e77 --- /dev/null +++ b/TeachingAssistantUltimate/READ ME.md @@ -0,0 +1,32 @@ +

About project

+ +

The project is about creating a software to assist teachers +of tertiary education levels have their own question bank and easily record +assessment of their tutors.

+ +

Even though it says teachers of tertiary level, nothing prevents +a teacher at any basic level from using the software, as long as it meets your +needs

+ +

Dependencies

+ +

·         +AspNetCore ® 2.0 +Angular 4+ template modified to use Angular ® 5

+ +

·         +SQLite ®

+ +

·         +jQuery ®

+ +

·         +Bootstrap ®

diff --git a/TeachingAssistantUltimate/Startup.cs b/TeachingAssistantUltimate/Startup.cs index 1013f6d..45e3f1f 100644 --- a/TeachingAssistantUltimate/Startup.cs +++ b/TeachingAssistantUltimate/Startup.cs @@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using TeachingAssistant.Context; +using TeachingAssistantUltimate.Context; namespace TeachingAssistantUltimate { diff --git a/TeachingAssistantUltimate/TeachingAssistantUltimate.csproj b/TeachingAssistantUltimate/TeachingAssistantUltimate.csproj index ca9c9e3..432e18b 100644 --- a/TeachingAssistantUltimate/TeachingAssistantUltimate.csproj +++ b/TeachingAssistantUltimate/TeachingAssistantUltimate.csproj @@ -6,6 +6,7 @@ false + @@ -47,6 +48,7 @@ + diff --git a/TeachingAssistantUltimate/Views/Home/Index.cshtml b/TeachingAssistantUltimate/Views/Home/Index.cshtml index d74c4a1..af84de9 100644 --- a/TeachingAssistantUltimate/Views/Home/Index.cshtml +++ b/TeachingAssistantUltimate/Views/Home/Index.cshtml @@ -2,7 +2,7 @@ ViewData["Title"] = "Home Page"; } -Loading... +Good thiings are Loading... @section scripts { diff --git a/TeachingAssistantUltimate/Views/Shared/_Layout.cshtml b/TeachingAssistantUltimate/Views/Shared/_Layout.cshtml index cb13dd0..42db9cb 100644 --- a/TeachingAssistantUltimate/Views/Shared/_Layout.cshtml +++ b/TeachingAssistantUltimate/Views/Shared/_Layout.cshtml @@ -19,4 +19,3 @@ @RenderSection("scripts", required: false) - \ No newline at end of file diff --git a/TeachingAssistantUltimate/assistant.db b/TeachingAssistantUltimate/assistant.db index b94f4b3..1f4c5b7 100644 Binary files a/TeachingAssistantUltimate/assistant.db and b/TeachingAssistantUltimate/assistant.db differ diff --git a/TeachingAssistantUltimate/npm-shrinkwrap.json b/TeachingAssistantUltimate/npm-shrinkwrap.json index f496ee8..4b5844f 100644 --- a/TeachingAssistantUltimate/npm-shrinkwrap.json +++ b/TeachingAssistantUltimate/npm-shrinkwrap.json @@ -1213,6 +1213,15 @@ } } }, + "adler-32": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.2.0.tgz", + "integrity": "sha1-aj5r8KY5ALoVZSgIyxXGgT0aXyU=", + "requires": { + "exit-on-epipe": "1.0.1", + "printj": "1.1.2" + } + }, "after": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz", @@ -2378,6 +2387,22 @@ } } }, + "cfb": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/cfb/-/cfb-1.0.7.tgz", + "integrity": "sha512-KjjZFR+a/e8RDdDTr4PwR0P/HIFRI3sxArFQttml0pFkhIO4TnvS/1+dqtGXPqe5/0MHp2IzjFx1JTzmohHT+w==", + "requires": { + "commander": "2.16.0", + "printj": "1.1.2" + }, + "dependencies": { + "commander": { + "version": "2.16.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz", + "integrity": "sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew==" + } + } + }, "chai": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/chai/-/chai-4.0.2.tgz", @@ -2613,6 +2638,22 @@ "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", "dev": true }, + "codepage": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/codepage/-/codepage-1.13.1.tgz", + "integrity": "sha512-KnY6cQlgkfBjplnQkLk3M5KEfAKa7i9SMqXp+bMuy2/bgYovvU4LDAQvkMaoScwhvozA9VUtgnbS4Z8f7zVA8w==", + "requires": { + "commander": "2.14.1", + "exit-on-epipe": "1.0.1" + }, + "dependencies": { + "commander": { + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz", + "integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw==" + } + } + }, "collection-visit": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-0.2.3.tgz", @@ -3000,6 +3041,15 @@ } } }, + "crc-32": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.0.tgz", + "integrity": "sha512-1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA==", + "requires": { + "exit-on-epipe": "1.0.1", + "printj": "1.1.2" + } + }, "create-ecdh": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz", @@ -4247,6 +4297,11 @@ } } }, + "exit-on-epipe": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz", + "integrity": "sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==" + }, "expand-braces": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz", @@ -4960,6 +5015,11 @@ "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", "dev": true }, + "frac": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/frac/-/frac-1.1.2.tgz", + "integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==" + }, "fragment-cache": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", @@ -9317,6 +9377,11 @@ "utila": "0.4.0" } }, + "printj": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/printj/-/printj-1.1.2.tgz", + "integrity": "sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==" + }, "printthis": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/printthis/-/printthis-0.1.5.tgz", @@ -10884,6 +10949,14 @@ "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", "dev": true }, + "ssf": { + "version": "0.10.2", + "resolved": "https://registry.npmjs.org/ssf/-/ssf-0.10.2.tgz", + "integrity": "sha512-rDhAPm9WyIsY8eZEKyE8Qsotb3j/wBdvMWBUsOhJdfhKGLfQidRjiBUV0y/MkyCLiXQ38FG6LWW/VYUtqlIDZQ==", + "requires": { + "frac": "1.1.2" + } + }, "sshpk": { "version": "1.14.2", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz", @@ -12353,6 +12426,27 @@ "integrity": "sha1-f4dliEdxbbUCYyOBL4GMras4el8=", "dev": true }, + "xlsx": { + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.13.1.tgz", + "integrity": "sha1-Zc+iReGvhY7OW6IrqhHRmkbptAA=", + "requires": { + "adler-32": "1.2.0", + "cfb": "1.0.7", + "codepage": "1.13.1", + "commander": "2.15.1", + "crc-32": "1.2.0", + "exit-on-epipe": "1.0.1", + "ssf": "0.10.2" + }, + "dependencies": { + "commander": { + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", + "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==" + } + } + }, "xml-char-classes": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/xml-char-classes/-/xml-char-classes-1.0.0.tgz", diff --git a/TeachingAssistantUltimate/package.json b/TeachingAssistantUltimate/package.json index 516a3ed..4885a2e 100644 --- a/TeachingAssistantUltimate/package.json +++ b/TeachingAssistantUltimate/package.json @@ -74,6 +74,7 @@ "enhanced-resolve": "^3.4.1", "ngx-quill-editor": "^2.2.2", "printthis": "^0.1.5", - "uglify-es": "^3.2.2" + "uglify-es": "^3.2.2", + "xlsx": "^0.13.1" } }