From 6117d8afddc5c84beb5db1e7745c648a0dc07602 Mon Sep 17 00:00:00 2001 From: TimothyMee Date: Thu, 1 Mar 2018 13:24:36 +0100 Subject: [PATCH] Done with new ui design. --- app/CourseRegistered.php | 12 +- .../CourseRegisteredController.php | 14 + public/js/app.js | 1638 +++++++++-------- .../js/components/admins/CreateAdmin.vue | 2 +- .../assets/js/components/admins/EditAdmin.vue | 2 +- .../js/components/courses/EditCourses.vue | 2 +- .../components/professors/EditProfessor.vue | 2 +- .../js/components/results/EditResult.vue | 131 +- .../js/components/results/ViewResult.vue | 142 +- .../js/components/results/createResult.vue | 78 +- .../js/components/students/EditStudents.vue | 2 +- resources/views/layouts/app1.blade.php | 26 + resources/views/results/edit.blade.php | 27 +- resources/views/results/index.blade.php | 27 +- resources/views/results/view.blade.php | 27 +- routes/web.php | 7 +- 16 files changed, 1255 insertions(+), 884 deletions(-) diff --git a/app/CourseRegistered.php b/app/CourseRegistered.php index 37dcbd4..89349c3 100644 --- a/app/CourseRegistered.php +++ b/app/CourseRegistered.php @@ -47,12 +47,22 @@ public function viewSelected($data) $results = $this->where('semester', $data['semester']) ->where('year', $data['year']) - ->where('student_id', $data['student_id']) ->get(); return $results; } + public function viewSelectedForStudent($data) + { + + $results = $this->where('semester', $data['semester']) + ->where('year', $data['year']) + ->where('student_id', $data['student_id']) + ->get(); + + return $results; + } + public function updateRegistration($data) { $data['staff_id'] = auth()->id(); diff --git a/app/Http/Controllers/CourseRegisteredController.php b/app/Http/Controllers/CourseRegisteredController.php index e431b00..9127e2d 100644 --- a/app/Http/Controllers/CourseRegisteredController.php +++ b/app/Http/Controllers/CourseRegisteredController.php @@ -104,5 +104,19 @@ public function viewSelectedRegistration(Request $request, CourseRegistered $cou } } + public function viewSelectedRegistrationForStudents(Request $request, CourseRegistered $courseRegistered) + { + try + { + $result = $courseRegistered->viewSelectedForStudent($request->all()); + + return apiSuccess($result); + } + catch (\Exception $e) + { + return apiFailure($e); + } + } + } diff --git a/public/js/app.js b/public/js/app.js index 7ba5f42..6b8dbc9 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -48742,7 +48742,20 @@ var render = function() { "tr", { staticClass: "odd gradeX" }, [ - _vm._m(4, true), + _c( + "td", + { staticClass: "patient-img" }, + [ + _c("img", { + attrs: { + src: + "/images/" + + student.image, + alt: "" + } + }) + ] + ), _vm._v(" "), _c( "td", @@ -48851,7 +48864,7 @@ var render = function() { ] ), _vm._v(" "), - _vm._m(5, true) + _vm._m(4, true) ]) ] ) @@ -48980,14 +48993,6 @@ var staticRenderFns = [ ]) ]) }, - function() { - var _vm = this - var _h = _vm.$createElement - var _c = _vm._self._c || _h - return _c("td", { staticClass: "patient-img" }, [ - _c("img", { attrs: { src: "", alt: "" } }) - ]) - }, function() { var _vm = this var _h = _vm.$createElement @@ -52263,7 +52268,20 @@ var render = function() { "tr", { staticClass: "odd gradeX" }, [ - _vm._m(4, true), + _c( + "td", + { staticClass: "patient-img" }, + [ + _c("img", { + attrs: { + src: + "/images/" + + course.image, + alt: "" + } + }) + ] + ), _vm._v(" "), _c( "td", @@ -52339,7 +52357,7 @@ var render = function() { ] ), _vm._v(" "), - _vm._m(5, true) + _vm._m(4, true) ]) ] ) @@ -52466,14 +52484,6 @@ var staticRenderFns = [ ]) ]) }, - function() { - var _vm = this - var _h = _vm.$createElement - var _c = _vm._self._c || _h - return _c("td", { staticClass: "patient-img" }, [ - _c("img", { attrs: { src: "", alt: "" } }) - ]) - }, function() { var _vm = this var _h = _vm.$createElement @@ -53545,6 +53555,80 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); // // // +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// /* harmony default export */ __webpack_exports__["default"] = ({ data: function data() { @@ -53674,252 +53758,266 @@ var render = function() { var _c = _vm._self._c || _h return _c( "div", + { staticClass: "row" }, [ - _c("notifications", { attrs: { position: "top center" } }), + _c("notifications", { attrs: { position: "center" } }), _vm._v(" "), - _c("div", { staticClass: "row" }, [ - _c("div", { staticClass: "col-md-12" }, [ - _c("table", { staticClass: "tbl-typical" }, [ - _vm._m(0), - _vm._v(" "), - _c("tr", [ - _c("td", [ - _vm._v( - "\n Year:\n " - ), - _c("input", { - directives: [ - { - name: "model", - rawName: "v-model", - value: _vm.year, - expression: "year" - } - ], - staticClass: "form-control", - attrs: { type: "text", placeholder: "2017/2018" }, - domProps: { value: _vm.year }, - on: { - input: function($event) { - if ($event.target.composing) { - return + _c("div", { staticClass: "col-md-12 col-sm-12" }, [ + _c("div", { staticClass: "card card-box" }, [ + _vm._m(0), + _vm._v(" "), + _c("div", { staticClass: "card-body", attrs: { id: "bar-parent" } }, [ + _c("div", { staticClass: "col-md-12" }, [ + _c("table", { staticClass: "tbl-typical" }, [ + _c("tr", [ + _c("td", [ + _vm._v( + "\n Year:\n " + ), + _c("input", { + directives: [ + { + name: "model", + rawName: "v-model", + value: _vm.year, + expression: "year" + } + ], + staticClass: "form-control", + attrs: { type: "text", placeholder: "2017/2018" }, + domProps: { value: _vm.year }, + on: { + input: function($event) { + if ($event.target.composing) { + return + } + _vm.year = $event.target.value + } } - _vm.year = $event.target.value - } - } - }) + }) + ]), + _vm._v(" "), + _c("td", [ + _vm._v( + "\n Semester:\n " + ), + _c( + "select", + { + directives: [ + { + name: "model", + rawName: "v-model", + value: _vm.semester, + expression: "semester" + } + ], + staticClass: "form-control", + attrs: { name: "", id: "" }, + on: { + change: function($event) { + var $$selectedVal = Array.prototype.filter + .call($event.target.options, function(o) { + return o.selected + }) + .map(function(o) { + var val = "_value" in o ? o._value : o.value + return val + }) + _vm.semester = $event.target.multiple + ? $$selectedVal + : $$selectedVal[0] + } + } + }, + [ + _c("option", { attrs: { value: "", selected: "" } }, [ + _vm._v("Semester") + ]), + _vm._v(" "), + _c("option", { attrs: { value: "1st" } }, [ + _vm._v("First Semester") + ]), + _vm._v(" "), + _c("option", { attrs: { value: "2nd" } }, [ + _vm._v("Second Semester") + ]) + ] + ) + ]) + ]) ]), _vm._v(" "), - _c("td", [ - _vm._v( - "\n Semester:\n " - ), - _c( - "select", - { - directives: [ - { - name: "model", - rawName: "v-model", - value: _vm.semester, - expression: "semester" - } - ], - staticClass: "form-control col-md-6", - attrs: { name: "", id: "" }, - on: { - change: function($event) { - var $$selectedVal = Array.prototype.filter - .call($event.target.options, function(o) { - return o.selected - }) - .map(function(o) { - var val = "_value" in o ? o._value : o.value - return val - }) - _vm.semester = $event.target.multiple - ? $$selectedVal - : $$selectedVal[0] - } - } - }, - [ - _c("option", { attrs: { value: "1st" } }, [ - _vm._v("First Semester") - ]), - _vm._v(" "), - _c("option", { attrs: { value: "2nd" } }, [ - _vm._v("Second Semester") - ]) - ] - ) - ]) - ]) - ]), - _vm._v(" "), - _c("hr"), - _vm._v(" "), - _c( - "table", - { staticClass: "tbl-typical col-md-4" }, - [ - _vm._m(1), + _c("hr"), _vm._v(" "), - _vm._l(_vm.registeredCourses, function(courseRegisteredDetails) { - return _c( - "tr", - _vm._l(_vm.students, function(student) { - return _c("span", [ - student.id == courseRegisteredDetails.student_id - ? _c("span", [ - _c("td", [ - _c( - "a", - { - on: { - click: function($event) { - _vm.viewResultForm( - courseRegisteredDetails.student_id - ) - } - } - }, - [ - _vm._v( - _vm._s(student.firstname) + - "   " + - _vm._s(student.identification_no) + _c( + "table", + { staticClass: "tbl-typical col-md-4" }, + [ + _vm._m(1), + _vm._v(" "), + _vm._l(_vm.registeredCourses, function( + courseRegisteredDetails + ) { + return _c( + "tr", + _vm._l(_vm.students, function(student) { + return _c("span", [ + student.id == courseRegisteredDetails.student_id + ? _c("span", [ + _c("td", [ + _c( + "a", + { + on: { + click: function($event) { + _vm.viewResultForm( + courseRegisteredDetails.student_id + ) + } + } + }, + [ + _vm._v( + _vm._s(student.firstname) + + "   " + + _vm._s(student.identification_no) + ) + ] ) - ] - ) - ]) - ]) - : _vm._e() - ]) + ]) + ]) + : _vm._e() + ]) + }) + ) }) - ) - }) - ], - 2 - ), - _vm._v(" "), - _c( - "table", - { - directives: [ - { - name: "show", - rawName: "v-show", - value: _vm.resultEditor, - expression: "resultEditor" - } - ], - staticClass: "tbl-typical" - }, - [ - _vm._m(2), + ], + 2 + ), _vm._v(" "), - _vm._l(_vm.resultDetails.results, function(result) { - return _c( - "tr", - [ - _vm._l(_vm.listOfCourses, function(courseDetails) { - return _c("span", [ - courseDetails.id == result.course_id.course_id - ? _c("td", [ - _vm._v( - "\n " + - _vm._s(courseDetails.course_code) + - "\n " - ) - ]) - : _vm._e() - ]) - }), - _vm._v(" "), - _c("td", [ - _c("input", { - directives: [ - { - name: "model", - rawName: "v-model", - value: result.C_A, - expression: "result.C_A" - } - ], - staticClass: "form-control", - attrs: { - type: "text", - placeholder: "Enter C.A. scores" - }, - domProps: { value: result.C_A }, - on: { - input: function($event) { - if ($event.target.composing) { - return + _c("br"), + _c("br"), + _vm._v(" "), + _c( + "table", + { + directives: [ + { + name: "show", + rawName: "v-show", + value: _vm.resultEditor, + expression: "resultEditor" + } + ], + staticClass: "tbl-typical" + }, + [ + _vm._m(2), + _vm._v(" "), + _vm._l(_vm.resultDetails.results, function(result) { + return _c( + "tr", + [ + _vm._l(_vm.listOfCourses, function(courseDetails) { + return _c("span", [ + courseDetails.id == result.course_id.course_id + ? _c("td", [ + _vm._v( + "\n " + + _vm._s(courseDetails.course_code) + + "\n " + ) + ]) + : _vm._e() + ]) + }), + _vm._v(" "), + _c("td", [ + _c("input", { + directives: [ + { + name: "model", + rawName: "v-model", + value: result.C_A, + expression: "result.C_A" + } + ], + staticClass: "form-control", + attrs: { + type: "text", + placeholder: "Enter C.A. scores" + }, + domProps: { value: result.C_A }, + on: { + input: function($event) { + if ($event.target.composing) { + return + } + _vm.$set(result, "C_A", $event.target.value) + } } - _vm.$set(result, "C_A", $event.target.value) - } - } - }) - ]), - _vm._v(" "), - _c("td", [ - _c("input", { - directives: [ - { - name: "model", - rawName: "v-model", - value: result.Exam, - expression: "result.Exam" - } - ], - staticClass: "form-control", - attrs: { - type: "text", - placeholder: "Enter Exam scores" - }, - domProps: { value: result.Exam }, - on: { - input: function($event) { - if ($event.target.composing) { - return + }) + ]), + _vm._v(" "), + _c("td", [ + _c("input", { + directives: [ + { + name: "model", + rawName: "v-model", + value: result.Exam, + expression: "result.Exam" + } + ], + staticClass: "form-control", + attrs: { + type: "text", + placeholder: "Enter Exam scores" + }, + domProps: { value: result.Exam }, + on: { + input: function($event) { + if ($event.target.composing) { + return + } + _vm.$set(result, "Exam", $event.target.value) + } } - _vm.$set(result, "Exam", $event.target.value) - } - } - }) - ]) - ], - 2 - ) - }) - ], - 2 - ), - _vm._v(" "), - _c( - "button", - { - directives: [ + }) + ]) + ], + 2 + ) + }) + ], + 2 + ), + _vm._v(" "), + _c( + "button", { - name: "show", - rawName: "v-show", - value: _vm.resultEditor, - expression: "resultEditor" - } - ], - staticClass: "btn btn-success", - staticStyle: { margin: "20px", float: "right" }, - on: { - click: function($event) { - $event.preventDefault() - _vm.submitResult($event) - } - } - }, - [_vm._v(" Save\n ")] - ) + directives: [ + { + name: "show", + rawName: "v-show", + value: _vm.resultEditor, + expression: "resultEditor" + } + ], + staticClass: "btn btn-success", + staticStyle: { margin: "20px", float: "right" }, + on: { + click: function($event) { + $event.preventDefault() + _vm.submitResult($event) + } + } + }, + [_vm._v(" Save\n ")] + ) + ]) + ]) ]) ]) ], @@ -53931,12 +54029,8 @@ var staticRenderFns = [ var _vm = this var _h = _vm.$createElement var _c = _vm._self._c || _h - return _c("tr", [ - _c("th", { attrs: { align: "" } }, [ - _c("h4", [_vm._v("Result Filling")]) - ]), - _vm._v(" "), - _c("th") + return _c("div", { staticClass: "card-head" }, [ + _c("header", [_vm._v("Result Filling")]) ]) }, function() { @@ -54098,6 +54192,12 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); // // // +// +// +// +// +// +// /* harmony default export */ __webpack_exports__["default"] = ({ data: function data() { @@ -54303,212 +54403,258 @@ var render = function() { var _c = _vm._self._c || _h return _c( "div", + { staticClass: "row" }, [ - _c("notifications", { attrs: { position: "top center" } }), + _c("notifications", { attrs: { position: "center" } }), _vm._v(" "), - _c("table", { staticClass: "tbl-typical" }, [ - _vm._m(0), - _vm._v(" "), - _c("tr", [ - _c("td", [ - _vm._v("\n Year:\n "), - _c("input", { - directives: [ - { - name: "model", - rawName: "v-model", - value: _vm.year, - expression: "year" - } - ], - staticClass: "form-control", - attrs: { type: "text", placeholder: "2017/2018" }, - domProps: { value: _vm.year }, - on: { - input: function($event) { - if ($event.target.composing) { - return - } - _vm.year = $event.target.value - } - } - }) - ]), + _c("div", { staticClass: "col-md-12 col-sm-12" }, [ + _c("div", { staticClass: "card card-box" }, [ + _vm._m(0), _vm._v(" "), - _c("td", [ - _vm._v("\n Semester:\n "), - _c( - "select", - { - directives: [ - { - name: "model", - rawName: "v-model", - value: _vm.semester, - expression: "semester" - } - ], - staticClass: "form-control col-md-6", - attrs: { name: "", id: "" }, - on: { - change: function($event) { - var $$selectedVal = Array.prototype.filter - .call($event.target.options, function(o) { - return o.selected - }) - .map(function(o) { - var val = "_value" in o ? o._value : o.value - return val - }) - _vm.semester = $event.target.multiple - ? $$selectedVal - : $$selectedVal[0] - } - } - }, - [ - _c("option", { attrs: { value: "1st" } }, [ - _vm._v("First Semester") - ]), + _c("div", { staticClass: "card-body", attrs: { id: "bar-parent" } }, [ + _c("div", { staticClass: "col-md-12" }, [ + _c("table", { staticClass: "tbl-typical" }, [ + _vm._m(1), _vm._v(" "), - _c("option", { attrs: { value: "2nd" } }, [ - _vm._v("Second Semester") + _c("tr", [ + _c("td", [ + _vm._v( + "\n Year:\n " + ), + _c("input", { + directives: [ + { + name: "model", + rawName: "v-model", + value: _vm.year, + expression: "year" + } + ], + staticClass: "form-control", + attrs: { type: "text", placeholder: "2017/2018" }, + domProps: { value: _vm.year }, + on: { + input: function($event) { + if ($event.target.composing) { + return + } + _vm.year = $event.target.value + } + } + }) + ]), + _vm._v(" "), + _c("td", [ + _vm._v( + "\n Semester:\n " + ), + _c( + "select", + { + directives: [ + { + name: "model", + rawName: "v-model", + value: _vm.semester, + expression: "semester" + } + ], + staticClass: "form-control", + attrs: { name: "", id: "" }, + on: { + change: function($event) { + var $$selectedVal = Array.prototype.filter + .call($event.target.options, function(o) { + return o.selected + }) + .map(function(o) { + var val = "_value" in o ? o._value : o.value + return val + }) + _vm.semester = $event.target.multiple + ? $$selectedVal + : $$selectedVal[0] + } + } + }, + [ + _c("option", { attrs: { value: "" } }, [ + _vm._v("Semester") + ]), + _vm._v(" "), + _c("option", { attrs: { value: "1st" } }, [ + _vm._v("First Semester") + ]), + _vm._v(" "), + _c("option", { attrs: { value: "2nd" } }, [ + _vm._v("Second Semester") + ]) + ] + ) + ]) ]) - ] - ) - ]) - ]) - ]), - _vm._v(" "), - _c( - "table", - { staticClass: "tbl-typical col-md-4" }, - [ - _vm._m(1), - _vm._v(" "), - _vm._l(_vm.allResults, function(resultDetails) { - return _c( - "tr", - _vm._l(_vm.students, function(student) { - return _c("span", [ - student.id == resultDetails.student_id - ? _c("span", [ - _c("td", [ + ]), + _vm._v(" "), + _c("br"), + _c("br"), + _vm._v(" "), + _c( + "table", + { staticClass: "tbl-typical col-md-4" }, + [ + _vm._m(2), + _vm._v(" "), + _vm._l(_vm.allResults, function(resultDetails) { + return _c( + "tr", + _vm._l(_vm.students, function(student) { + return _c("span", [ + student.id == resultDetails.student_id + ? _c("span", [ + _c("td", [ + _c( + "a", + { + attrs: { href: "#" }, + on: { + click: function($event) { + _vm.viewResult( + resultDetails.student_id + ) + } + } + }, + [ + _vm._v( + _vm._s(student.lastname) + + " " + + _vm._s(student.firstname) + + "   " + + _vm._s(student.identification_no) + ) + ] + ) + ]) + ]) + : _vm._e() + ]) + }) + ) + }) + ], + 2 + ), + _vm._v(" "), + _c( + "div", + { + directives: [ + { + name: "show", + rawName: "v-show", + value: _vm.showResult, + expression: "showResult" + } + ], + staticClass: "table-scrollable" + }, + [ + _c( + "table", + { + staticClass: + "table table-striped table-bordered table-hover table-checkable order-column valign-middle" + }, + [ + _vm._m(3), + _vm._v(" "), + _vm._l(_vm.resultArray, function(results) { + return _c( + "tbody", + _vm._l(results, function(result) { + return result.student_id == _vm.selectedStudentId + ? _c("tr", [ + _c("td", { attrs: { align: "center" } }, [ + _vm._v(_vm._s(result.course_code)) + ]), + _vm._v(" "), + _c("td", { attrs: { align: "center" } }, [ + _vm._v(_vm._s(result.unit)) + ]), + _vm._v(" "), + _c("td", { attrs: { align: "center" } }, [ + _vm._v(_vm._s(result.C_A)) + ]), + _vm._v(" "), + _c("td", { attrs: { align: "center" } }, [ + _vm._v(_vm._s(result.Exam)) + ]), + _vm._v(" "), + _c("td", { attrs: { align: "center" } }, [ + _vm._v(_vm._s(result.total)) + ]), + _vm._v(" "), + _c("td", { attrs: { align: "center" } }, [ + _vm._v(_vm._s(result.grade)) + ]) + ]) + : _vm._e() + }) + ) + }), + _vm._v(" "), + _c("tbody", [ + _c("tr", [ _c( - "a", - { - attrs: { href: "#" }, - on: { - click: function($event) { - _vm.viewResult(resultDetails.student_id) - } - } - }, + "th", + { attrs: { align: "center", colspan: "2" } }, + [ + _vm._v( + "Total Grade Points: " + + _vm._s(_vm.gpa.totalGradePoints) + ) + ] + ), + _vm._v(" "), + _c( + "th", + { attrs: { align: "center", colspan: "2" } }, [ _vm._v( - _vm._s(student.lastname) + - " " + - _vm._s(student.firstname) + - "   " + - _vm._s(student.identification_no) + "Total Units: " + _vm._s(_vm.gpa.totalUnits) ) ] + ), + _vm._v(" "), + _c( + "th", + { attrs: { align: "center", colspan: "2" } }, + [_vm._v("GPA: " + _vm._s(_vm.gpa.gpa))] ) ]) ]) - : _vm._e() - ]) - }) - ) - }) - ], - 2 - ), - _vm._v(" "), - _c( - "div", - { - directives: [ - { - name: "show", - rawName: "v-show", - value: _vm.showResult, - expression: "showResult" - } - ] - }, - [ - _vm._m(2), - _vm._v(" "), - _vm._l(_vm.resultArray, function(results) { - return _c( - "span", - _vm._l(results, function(result) { - return _c("span", [ - result.student_id == _vm.selectedStudentId - ? _c("span", [ - _c("table", { staticClass: "tbl-typical" }, [ - _c("tr", [ - _c("td", { attrs: { align: "center" } }, [ - _vm._v(_vm._s(result.course_code)) - ]), - _vm._v(" "), - _c("td", { attrs: { align: "center" } }, [ - _vm._v(_vm._s(result.unit)) - ]), - _vm._v(" "), - _c("td", { attrs: { align: "center" } }, [ - _vm._v(_vm._s(result.C_A)) - ]), - _vm._v(" "), - _c("td", { attrs: { align: "center" } }, [ - _vm._v(_vm._s(result.Exam)) - ]), - _vm._v(" "), - _c("td", { attrs: { align: "center" } }, [ - _vm._v(_vm._s(result.total)) - ]), - _vm._v(" "), - _c("td", { attrs: { align: "center" } }, [ - _vm._v(_vm._s(result.grade)) - ]) - ]) - ]) - ]) - : _vm._e() - ]) - }) - ) - }), - _vm._v(" "), - _c("br"), - _c("br"), - _vm._v(" "), - _c("table", { staticClass: "tbl-typical" }, [ - _c("tr", [ - _c("th", { attrs: { align: "center" } }, [ - _vm._v( - "Total Grade Points : " + _vm._s(_vm.gpa.totalGradePoints) - ) - ]), - _vm._v(" "), - _c("th", { attrs: { align: "center" } }, [ - _vm._v("Total Units : " + _vm._s(_vm.gpa.totalUnits)) - ]), - _vm._v(" "), - _c("th", { attrs: { align: "center" } }, [ - _vm._v("GPA : " + _vm._s(_vm.gpa.gpa)) - ]) + ], + 2 + ) + ] + ) ]) ]) - ], - 2 - ) + ]) + ]) ], 1 ) } var staticRenderFns = [ + function() { + var _vm = this + var _h = _vm.$createElement + var _c = _vm._self._c || _h + return _c("div", { staticClass: "card-head" }, [ + _c("header", [_vm._v("View Result")]) + ]) + }, function() { var _vm = this var _h = _vm.$createElement @@ -54531,7 +54677,7 @@ var staticRenderFns = [ var _vm = this var _h = _vm.$createElement var _c = _vm._self._c || _h - return _c("table", { staticClass: "table tbl-typical" }, [ + return _c("thead", [ _c("tr", [ _c("th", { attrs: { align: "center" } }, [_vm._v("Course Code")]), _vm._v(" "), @@ -54682,6 +54828,13 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); // // // +// +// +// +// +// +// +// /* harmony default export */ __webpack_exports__["default"] = ({ data: function data() { @@ -54797,281 +54950,295 @@ var render = function() { var _c = _vm._self._c || _h return _c( "div", + { staticClass: "row" }, [ - _c("notifications", { attrs: { position: "top center" } }), + _c("notifications", { attrs: { position: "center" } }), _vm._v(" "), - _c("div", { staticClass: "row" }, [ - _c("div", { staticClass: "col-md-12" }, [ - _c("table", { staticClass: "tbl-typical" }, [ - _vm._m(0), - _vm._v(" "), - _c("tr", [ - _c("td", [ - _vm._v( - "\n Year:\n " - ), - _c("input", { - directives: [ - { - name: "model", - rawName: "v-model", - value: _vm.year, - expression: "year" - } - ], - staticClass: "form-control", - attrs: { type: "text", placeholder: "2017/2018" }, - domProps: { value: _vm.year }, - on: { - input: function($event) { - if ($event.target.composing) { - return - } - _vm.year = $event.target.value - } - } - }) - ]), - _vm._v(" "), - _c("td", [ - _vm._v( - "\n Semester:\n " - ), - _c( - "select", - { - directives: [ - { - name: "model", - rawName: "v-model", - value: _vm.semester, - expression: "semester" - } - ], - staticClass: "form-control col-md-6", - attrs: { name: "", id: "" }, - on: { - change: function($event) { - var $$selectedVal = Array.prototype.filter - .call($event.target.options, function(o) { - return o.selected - }) - .map(function(o) { - var val = "_value" in o ? o._value : o.value - return val - }) - _vm.semester = $event.target.multiple - ? $$selectedVal - : $$selectedVal[0] - } - } - }, - [ - _c("option", { attrs: { value: "1st" } }, [ - _vm._v("First Semester") - ]), - _vm._v(" "), - _c("option", { attrs: { value: "2nd" } }, [ - _vm._v("Second Semester") - ]) - ] - ) - ]) - ]) - ]), - _vm._v(" "), - _c("hr"), - _vm._v(" "), - _c( - "table", - { staticClass: "tbl-typical col-md-4" }, - [ - _vm._m(1), - _vm._v(" "), - _vm._l(_vm.allResults, function(results) { - return _c( - "tr", - _vm._l(_vm.students, function(student) { - return _c("span", [ - student.id == results.student_id - ? _c("span", [ - _c("td", [ - _c( - "a", - { - attrs: { href: "#" }, - on: { - click: function($event) { - _vm.viewResultForm(results) - } - } - }, - [ - _vm._v( - _vm._s(student.firstname) + - "   " + - _vm._s(student.identification_no) - ) - ] - ) - ]) - ]) - : _vm._e() - ]) - }) - ) - }) - ], - 2 - ), - _vm._v(" "), - _c( - "table", - { - directives: [ - { - name: "show", - rawName: "v-show", - value: _vm.resultEditor, - expression: "resultEditor" - } - ], - staticClass: "tbl-typical" - }, - [ - _c("tr", [ - _c("th", [_vm._v("Course")]), - _vm._v(" "), - _c("th", [_vm._v("C.A.")]), - _vm._v(" "), - _c("th", [_vm._v("Exams")]), - _vm._v(" "), - _c( - "th", - [ - _c("label", { staticStyle: { "margin-left": "20px" } }, [ - _vm._v("Edit?") - ]), - _c("switches", { - staticStyle: { "margin-left": "10px" }, - attrs: { color: "blue" }, - model: { - value: _vm.edit, - callback: function($$v) { - _vm.edit = $$v - }, - expression: "edit" + _c("div", { staticClass: "col-md-12 col-sm-12" }, [ + _c("div", { staticClass: "card card-box" }, [ + _vm._m(0), + _vm._v(" "), + _c("div", { staticClass: "card-body", attrs: { id: "bar-parent" } }, [ + _c("div", { staticClass: "col-md-12" }, [ + _c("table", { staticClass: "tbl-typical" }, [ + _vm._m(1), + _vm._v(" "), + _c("tr", [ + _c("td", [ + _vm._v( + "\n Year:\n " + ), + _c("input", { + directives: [ + { + name: "model", + rawName: "v-model", + value: _vm.year, + expression: "year" + } + ], + staticClass: "form-control", + attrs: { type: "text", placeholder: "2017/2018" }, + domProps: { value: _vm.year }, + on: { + input: function($event) { + if ($event.target.composing) { + return + } + _vm.year = $event.target.value + } } }) - ], - 1 - ) - ]), - _vm._v(" "), - _vm._l(_vm.resultArray, function(result) { - return _c( - "tr", - [ - _vm._l(_vm.listOfCourses, function(courseDetails) { - return _c("span", [ - courseDetails.id == result.course_id.course_id - ? _c("td", [ - _vm._v( - "\n " + - _vm._s(courseDetails.course_code) + - "\n " - ) - ]) - : _vm._e() - ]) - }), - _vm._v(" "), - _c("td", [ - _c("input", { + ]), + _vm._v(" "), + _c("td", [ + _vm._v( + "\n Semester:\n " + ), + _c( + "select", + { directives: [ { name: "model", rawName: "v-model", - value: result.C_A, - expression: "result.C_A" + value: _vm.semester, + expression: "semester" } ], staticClass: "form-control", - attrs: { - type: "text", - placeholder: "Enter C.A. scores", - disabled: !_vm.edit - }, - domProps: { value: result.C_A }, + attrs: { name: "", id: "" }, on: { - input: function($event) { - if ($event.target.composing) { - return - } - _vm.$set(result, "C_A", $event.target.value) + change: function($event) { + var $$selectedVal = Array.prototype.filter + .call($event.target.options, function(o) { + return o.selected + }) + .map(function(o) { + var val = "_value" in o ? o._value : o.value + return val + }) + _vm.semester = $event.target.multiple + ? $$selectedVal + : $$selectedVal[0] } } + }, + [ + _c("option", { attrs: { value: "1st" } }, [ + _vm._v("First Semester") + ]), + _vm._v(" "), + _c("option", { attrs: { value: "2nd" } }, [ + _vm._v("Second Semester") + ]) + ] + ) + ]) + ]) + ]), + _vm._v(" "), + _c("hr"), + _vm._v(" "), + _c( + "table", + { staticClass: "tbl-typical col-md-4" }, + [ + _vm._m(2), + _vm._v(" "), + _vm._l(_vm.allResults, function(results) { + return _c( + "tr", + _vm._l(_vm.students, function(student) { + return _c("span", [ + student.id == results.student_id + ? _c("span", [ + _c("td", [ + _c( + "a", + { + attrs: { href: "#" }, + on: { + click: function($event) { + _vm.viewResultForm(results) + } + } + }, + [ + _vm._v( + _vm._s(student.lastname) + + " " + + _vm._s(student.firstname) + + "   " + + _vm._s(student.identification_no) + ) + ] + ) + ]) + ]) + : _vm._e() + ]) }) - ]), + ) + }) + ], + 2 + ), + _vm._v(" "), + _c("br"), + _c("br"), + _vm._v(" "), + _c( + "table", + { + directives: [ + { + name: "show", + rawName: "v-show", + value: _vm.resultEditor, + expression: "resultEditor" + } + ], + staticClass: "tbl-typical" + }, + [ + _c("tr", [ + _c("th", [_vm._v("Course")]), _vm._v(" "), - _c("td", [ - _c("input", { - directives: [ - { - name: "model", - rawName: "v-model", - value: result.Exam, - expression: "result.Exam" + _c("th", [_vm._v("C.A.")]), + _vm._v(" "), + _c("th", [_vm._v("Exams")]), + _vm._v(" "), + _c( + "th", + [ + _c( + "label", + { staticStyle: { "margin-left": "20px" } }, + [_vm._v("Edit?")] + ), + _c("switches", { + staticStyle: { "margin-left": "10px" }, + attrs: { color: "blue" }, + model: { + value: _vm.edit, + callback: function($$v) { + _vm.edit = $$v + }, + expression: "edit" } - ], - staticClass: "form-control", - attrs: { - type: "text", - placeholder: "Enter Exam scores", - disabled: !_vm.edit - }, - domProps: { value: result.Exam }, - on: { - input: function($event) { - if ($event.target.composing) { - return + }) + ], + 1 + ) + ]), + _vm._v(" "), + _vm._l(_vm.resultArray, function(result) { + return _c( + "tr", + [ + _vm._l(_vm.listOfCourses, function(courseDetails) { + return _c("span", [ + courseDetails.id == result.course_id.course_id + ? _c("td", [ + _vm._v( + "\n " + + _vm._s(courseDetails.course_code) + + "\n " + ) + ]) + : _vm._e() + ]) + }), + _vm._v(" "), + _c("td", [ + _c("input", { + directives: [ + { + name: "model", + rawName: "v-model", + value: result.C_A, + expression: "result.C_A" + } + ], + staticClass: "form-control", + attrs: { + type: "text", + placeholder: "Enter C.A. scores", + disabled: !_vm.edit + }, + domProps: { value: result.C_A }, + on: { + input: function($event) { + if ($event.target.composing) { + return + } + _vm.$set(result, "C_A", $event.target.value) + } } - _vm.$set(result, "Exam", $event.target.value) - } - } - }) - ]) - ], - 2 - ) - }) - ], - 2 - ), - _vm._v(" "), - _c( - "button", - { - directives: [ + }) + ]), + _vm._v(" "), + _c("td", [ + _c("input", { + directives: [ + { + name: "model", + rawName: "v-model", + value: result.Exam, + expression: "result.Exam" + } + ], + staticClass: "form-control", + attrs: { + type: "text", + placeholder: "Enter Exam scores", + disabled: !_vm.edit + }, + domProps: { value: result.Exam }, + on: { + input: function($event) { + if ($event.target.composing) { + return + } + _vm.$set(result, "Exam", $event.target.value) + } + } + }) + ]) + ], + 2 + ) + }) + ], + 2 + ), + _vm._v(" "), + _c( + "button", { - name: "show", - rawName: "v-show", - value: _vm.resultEditor, - expression: "resultEditor" - } - ], - staticClass: "btn btn-success", - staticStyle: { margin: "20px", float: "right" }, - attrs: { disabled: !_vm.edit }, - on: { - click: function($event) { - $event.preventDefault() - _vm.updateResult($event) - } - } - }, - [_vm._v(" Save\n ")] - ) + directives: [ + { + name: "show", + rawName: "v-show", + value: _vm.resultEditor, + expression: "resultEditor" + } + ], + staticClass: "btn btn-success", + staticStyle: { margin: "20px", float: "right" }, + attrs: { disabled: !_vm.edit }, + on: { + click: function($event) { + $event.preventDefault() + _vm.updateResult($event) + } + } + }, + [_vm._v(" Save\n ")] + ) + ]) + ]) ]) ]) ], @@ -55079,6 +55246,14 @@ var render = function() { ) } var staticRenderFns = [ + function() { + var _vm = this + var _h = _vm.$createElement + var _c = _vm._self._c || _h + return _c("div", { staticClass: "card-head" }, [ + _c("header", [_vm._v("View Result")]) + ]) + }, function() { var _vm = this var _h = _vm.$createElement @@ -57315,7 +57490,20 @@ var render = function() { "tr", { staticClass: "odd gradeX" }, [ - _vm._m(4, true), + _c( + "td", + { staticClass: "patient-img" }, + [ + _c("img", { + attrs: { + src: + "/images/" + + professor.image, + alt: "" + } + }) + ] + ), _vm._v(" "), _c( "td", @@ -57427,7 +57615,7 @@ var render = function() { ] ), _vm._v(" "), - _vm._m(5, true) + _vm._m(4, true) ]) ] ) @@ -57556,14 +57744,6 @@ var staticRenderFns = [ ]) ]) }, - function() { - var _vm = this - var _h = _vm.$createElement - var _c = _vm._self._c || _h - return _c("td", { staticClass: "patient-img" }, [ - _c("img", { attrs: { src: "", alt: "" } }) - ]) - }, function() { var _vm = this var _h = _vm.$createElement @@ -58215,7 +58395,10 @@ var render = function() { } ], staticClass: "form-control input-height", - attrs: { type: "text", placeholder: "Email Address" }, + attrs: { + tydpe: "text", + placeholder: "Email Address" + }, domProps: { value: _vm.admin.email }, on: { input: function($event) { @@ -59421,7 +59604,22 @@ var render = function() { "tr", { staticClass: "odd gradeX" }, [ - _vm._m(4, true), + _c( + "td", + { + staticClass: "patient-img" + }, + [ + _c("img", { + attrs: { + src: + "/images/" + + admin.image, + alt: "" + } + }) + ] + ), _vm._v(" "), _c( "td", @@ -59536,7 +59734,7 @@ var render = function() { ] ), _vm._v(" "), - _vm._m(5, true) + _vm._m(4, true) ]) ] ) @@ -59666,14 +59864,6 @@ var staticRenderFns = [ ]) ]) }, - function() { - var _vm = this - var _h = _vm.$createElement - var _c = _vm._self._c || _h - return _c("td", { staticClass: "patient-img" }, [ - _c("img", { attrs: { src: "", alt: "" } }) - ]) - }, function() { var _vm = this var _h = _vm.$createElement diff --git a/resources/assets/js/components/admins/CreateAdmin.vue b/resources/assets/js/components/admins/CreateAdmin.vue index e7b78ab..50965bf 100644 --- a/resources/assets/js/components/admins/CreateAdmin.vue +++ b/resources/assets/js/components/admins/CreateAdmin.vue @@ -46,7 +46,7 @@ - +
diff --git a/resources/assets/js/components/admins/EditAdmin.vue b/resources/assets/js/components/admins/EditAdmin.vue index 3ee9af6..54ec57a 100644 --- a/resources/assets/js/components/admins/EditAdmin.vue +++ b/resources/assets/js/components/admins/EditAdmin.vue @@ -111,7 +111,7 @@ {{++index1}} - + {{++index2 * index1}} {{admin.lastname}} {{admin.firstname}} diff --git a/resources/assets/js/components/courses/EditCourses.vue b/resources/assets/js/components/courses/EditCourses.vue index 03af15b..2acbee3 100644 --- a/resources/assets/js/components/courses/EditCourses.vue +++ b/resources/assets/js/components/courses/EditCourses.vue @@ -96,7 +96,7 @@ - + {{++index}} {{course.name}} diff --git a/resources/assets/js/components/professors/EditProfessor.vue b/resources/assets/js/components/professors/EditProfessor.vue index a0b5a14..c3ee79b 100644 --- a/resources/assets/js/components/professors/EditProfessor.vue +++ b/resources/assets/js/components/professors/EditProfessor.vue @@ -100,7 +100,7 @@ - + {{++index}} {{professor.lastname}} {{professor.firstname}} diff --git a/resources/assets/js/components/results/EditResult.vue b/resources/assets/js/components/results/EditResult.vue index 2be0b7f..5e442f8 100644 --- a/resources/assets/js/components/results/EditResult.vue +++ b/resources/assets/js/components/results/EditResult.vue @@ -1,72 +1,79 @@ diff --git a/resources/assets/js/components/results/ViewResult.vue b/resources/assets/js/components/results/ViewResult.vue index 65c4a53..55ab328 100644 --- a/resources/assets/js/components/results/ViewResult.vue +++ b/resources/assets/js/components/results/ViewResult.vue @@ -1,78 +1,84 @@ diff --git a/resources/assets/js/components/results/createResult.vue b/resources/assets/js/components/results/createResult.vue index ed4d2e4..3d10840 100644 --- a/resources/assets/js/components/results/createResult.vue +++ b/resources/assets/js/components/results/createResult.vue @@ -1,4 +1,78 @@ + + Save + <!–loading–> Save
- +-->