Development#1
Open
DavidWilliamK wants to merge 31 commits into
Open
Conversation
Removed duplicate files
Started integration with backend Bugs still exists in saveButton
ensist
suggested changes
Nov 13, 2018
| @@ -0,0 +1,229 @@ | |||
| $(document).ready(function(){ | |||
There was a problem hiding this comment.
this script should be renamed to employee.js and placed into component folder
There was a problem hiding this comment.
either place it to
components/employee/employee.js
or
pages/emplyoee/employee.js
| var exp = new RegExp(searchField, "i"); | ||
| $.ajax({ | ||
| type: "GET", | ||
| url: "http://localhost:8080/employee", |
There was a problem hiding this comment.
better to create a constant for host url, so it will be easier to change the host url
| margin: 0px; | ||
| padding: 0px; | ||
| } | ||
| /*------------Login--------------*/ |
There was a problem hiding this comment.
separate it to different file login.css
| border-radius: 5px; | ||
| border: 1px solid #47525E; | ||
| } | ||
| /*-------Home-----------*/ |
| color: black; | ||
| } | ||
|
|
||
| /*----------Navbar----------*/ |
There was a problem hiding this comment.
separate it to different file navbar.css
| @@ -0,0 +1,41 @@ | |||
| <!DOCTYPE html> | |||
There was a problem hiding this comment.
place it to pages/employee/employee.html
Validation with REGEX done on employee and item pages, validation on assignment page still need further check
Done validation on assignment creation and edit, Item and Employee name are now shown on assignment page
Integrated new "Request" feature that supports bulk assignment, removed CRUD on assignment page according to last technical mentoring and minor changes on ajax functions
Datas can now be search by username=>employee, and name=>item. However the reload button still does nothing
Code for getItem.js has been refactored in order to meet the requirement for unit tests. Unit test has also been intialized by installing karma, mocha and chai
Login is now implemented using cookie. However sessionId will change. Assignment buttons still can't be displayed and GetAssignmentDetail is also having some error.
Can now differntiate whether admin or employee logs in. Dashboard implemented with pagination error, perhaps BE related(?) GetAssignment and GetAssignmentDetail is fixed, however the button to increase and decrease status encountered error on click
Dashboard pagination temporarily fixed, however unlike admin's dashboard, employee's dashboard still have no pagination. Probably BE related Buttons to increase and decrease status on assignment page is now working the way it should. Logged in user's profile can now be viewed by clicking the rightmost item on navbar.
Dashboard now have a new card that displays the amount of items that is corresponding to the logged in person. However, the itemCount displayed on the card is still waiting to be integrated, and the pagination for this table is also having problem should the logged in person is not an admin
Navbar can now either display the logged in employee's name if the user is an employee, or display welcome message for admin. Item detail modals can now display item descriptions. Assignment detail modals can now display assignment notes.
Minor bug fix on dashboard tables' pagination. Reinitialized test using mocha, karma and chai. However no test files have been made.
Dashborad pagination for admin's view is as expected BE related and is currently fixed. Added alert that displays message for unauthorized actions. However, admins have yet to be alerted should there be some kind of unauthorized actions.
Istanbul is added to monitor project's test coverage. Dummy test is made to clarify whether the config is successfull, and it currently isn't if test uses karma. However, runs perfectly with only karma and chai.
Codes can now be tested. Test coverage can now be shown using istanbul and karma. Added a small amount of test for login and getPendingTable in dashboard.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.