diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..aef844305 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "liveServer.settings.port": 5501 +} \ No newline at end of file diff --git a/assignments/lambda-classes.js b/assignments/lambda-classes.js index 1a0561b8b..12ae70eb9 100644 --- a/assignments/lambda-classes.js +++ b/assignments/lambda-classes.js @@ -24,6 +24,10 @@ class Instructor extends Person { grade(student, subject) { console.log(`${student.name} receives a perfect score on ${subject}`); } + examResult(student, grade) { + let newGrade = (grade * Math.random()); + console.log(`The final grade of ${student.name} is ${newGrade}`); + } } class Student extends Person { @@ -32,6 +36,7 @@ class Student extends Person { this.previousBackground = studentInfo.previousBackground; this.className = studentInfo.className; this.favSubjects = studentInfo.favSubjects; + this.grade = studentInfo.grade; } listsSubjects() { console.log(`${this.favSubjects}`); @@ -42,6 +47,12 @@ class Student extends Person { sprintChallenge (subject) { console.log(`${this.name} has begun sprint challenge on ${subject}`); } + graduate () { + if(this.grade > 70) { + return (`Congratulations ${this.name}, you can graduate!`); + } + return (`Sorry ${this.name} you need more assignments completed to boost your score. No graduation for you, yet...`); + } } class ProjectManager extends Instructor { @@ -70,16 +81,26 @@ gabe.speak(); gabe.demo('debugging'); gabe.grade({name: 'Martin', age: 23}, 'helping classmates'); -const jayne = new Student ({name: 'Jayne', age:23, location: 'Glasgow', gender: 'F', previousBackground: 'Singing Teacher', className: 'WEB EU2', favSubjects: ['Html', 'CSS', 'Javascript', 'Code-along sessions'], }) + +const jayne = new Student ({name: 'Jayne', age:21, location: 'Glasgow', grade: 80, gender: 'F', previousBackground: 'Singing Teacher', className: 'WEB EU2', favSubjects: ['Html', 'CSS', 'Javascript', 'Code-along sessions'], }) + +const joan = new Student ({name: 'Joan', age:19, location: 'Stirling', grade: 20, gender: 'F', previousBackground: 'Teacher', className: 'WEB EU2', favSubjects: ['Html', 'CSS', 'Javascript', 'Code-along sessions'], }) +joan.speak(); +console.log(joan.graduate()); +gabe.examResult({name: 'Jayne', age: 21}, jayne.grade); + jayne.speak(); // jayne.demo('debugging'); jayne.listsSubjects(); jayne.PRAssignment('Classes'); jayne.sprintChallenge('Scotland'); +jayne.graduate(); + +const ruairidh = new ProjectManager ({name: 'Ruairidh', age:21, location: 'London', gender: 'M', specialty: 'Lambda school', favLanguage: 'London', catchPhrase: 'Exemplary', gradClassName: 'House of Lambda', favInstructor: 'Gabriel'}) +ruairidh.speak(); +ruairidh.demo('websites'); +// ruairidh.PRAssignment('Orange'); +ruairidh.standUp('Web EU2'); +ruairidh.debugsCode({name: 'Jayne', age: 22, location: 'UK'}, 'coding typos'); + -const anthony = new ProjectManager ({name: 'Anthony', age:20, location: 'The Netherlands', gender: 'M', specialty: 'Lambda school', favLanguage: 'Dutch', catchPhrase: 'Good job', gradClassName: 'House of Lambda', favInstructor: 'Gabriel'}) -anthony.speak(); -anthony.demo('websites'); -// anthony.PRAssignment('Orange'); -anthony.standUp('Web EU2'); -anthony.debugsCode({name: 'Jayne', age: 22, location: 'UK'}, 'coding typos');