Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closes AgileVentures/MetPlus_tracker#520 #498

Merged
merged 6 commits into from Feb 8, 2017

Conversation

hin101
Copy link
Contributor

@hin101 hin101 commented Feb 1, 2017

My Profile Page

- elsif current_user.actable_type == 'AgencyPerson'
= link_to 'Edit Profile', edit_profile_agency_person_path(current_user.actable_id)
= link_to 'My Profile', my_profile_agency_person_path(current_user.actable_id)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long. [98/90]

- elsif current_user.actable_type == 'CompanyPerson'
= link_to 'Edit Profile', edit_profile_company_person_path(current_user.actable_id)
= link_to 'My Profile', my_profile_company_person_path(current_user.actable_id)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long. [99/90]

@@ -45,11 +45,11 @@
%ul.dropdown-menu{ 'aria-labelledby' => 'dd_menu' }
%li
- if current_user.actable_type == 'JobSeeker'
= link_to 'Edit Profile', edit_job_seeker_path(current_user.actable_id)
= link_to 'My Profile', my_profile_job_seeker_path(current_user.actable_id)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long. [95/90]

@@ -10,7 +10,7 @@
%li{:class => "menu-item #{ yield(:job_active) }"}
%a{:href => '/jobs', id: 'job'} Jobs
%li{ :class => "menu-item #{ yield(:about_active) }" }
%a{:href => '#', id: 'about'} About
%a{:href => '/about', id: 'about'} About

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hash attribute should start with one space after the opening brace
Hash attribute should end with one space before the closing brace

%h4
%strong Phone:
= @jobseeker.phone
= link_to "Edit", edit_job_seeker_path(@jobseeker), class: "btn btn-lg edit-profile-btn"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Files should end with a trailing newline
Line is too long. [92/90]

@@ -0,0 +1,16 @@
%div.row
%div.col-md-4

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

%div.col-md-4 can be written as .col-md-4 since %div is implicit

@@ -0,0 +1,16 @@
%div.row

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

%div.row can be written as .row since %div is implicit

%h4
%strong Phone:
= @company_person.phone
= link_to "Edit", edit_profile_company_person_path(@company_person), class: "btn btn-lg edit-profile-btn"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long. [109/90]
Files should end with a trailing newline

@@ -0,0 +1,16 @@
%div.row
%div.col-md-4

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

%div.col-md-4 can be written as .col-md-4 since %div is implicit

@@ -0,0 +1,16 @@
%div.row

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

%div.row can be written as .row since %div is implicit

%h4
%strong Phone:
= @agency_person.phone
= link_to "Edit", edit_profile_agency_person_path(@agency_person), class: "btn btn-lg edit-profile-btn"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long. [107/90]
Files should end with a trailing newline

@@ -0,0 +1,16 @@
%div.row
%div.col-md-4

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

%div.col-md-4 can be written as .col-md-4 since %div is implicit

@@ -0,0 +1,16 @@
%div.row

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

%div.row can be written as .row since %div is implicit

@@ -26,6 +26,11 @@ def home?
def update_profile?
user.is_company_person? record.company and user == record
end

def my_profile?
(agency_admin? user and agency_related_to_company?(user.agency, record.company)) or

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use && instead of and.
Use || instead of or.

def my_profile?
user.is_agency_person? record.agency
end

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Extra empty line detected at class body end.

font-size: 48px;
color: #0c7ba1;
font-weight: 700;
padding-bottom: 20px;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line should be indented with spaces, not tabs

.my-profile-header {
font-size: 48px;
color: #0c7ba1;
font-weight: 700;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line should be indented with spaces, not tabs

.my-profile-header {
font-size: 48px;
color: #0c7ba1;
font-weight: 700;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line should be indented with spaces, not tabs

@patmbolger
Copy link
Contributor

Looking at this I think we want to change the design a little - to better reflect the data items that the user can edit in their profile.

  1. For a job seeker, these are the items that can be edited:

screen shot 2017-02-02 at 6 21 21 am

So, these items should be listed on the "My Profile" page.

  1. On the profile page, I recommend just listing the full name (as shown above) as opposed to separate first name and surname. (the profile edit page, of course, separates those out).

  2. The item name (e.g. "Email") should be in bold, and the item value should not be in bold.

  3. Also, I think it looks better to left justify each column as shown above.

  4. Similar to the above items for company person profile. Show these items (plus address):

screen shot 2017-02-02 at 6 24 02 am

  1. Similar comments as above for an agency person.

@lollypop27
Copy link
Contributor

@hin101 good job thank you. Over and above @patmbolger changes please can you make sure that the form is centred left and right on the page, at the moment the space on the left of the page is less than the right of the page. Thank you.

%span.utc_to_local_time= @current_resume.updated_at
- else
You have no current resume
= link_to "Edit", edit_job_seeker_path(@jobseeker), class: "btn btn-lg edit-profile-btn"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long. [92/90]

@@ -1,6 +1,6 @@
%div{class:'row'}
%div{class:'col-sm-8 col-sm-offset-2'}
%h1 Edit JobSeeker Registration
%h1 Update Your Profile

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line contains tabs in indentation

%td
%strong Phone
%td= @company_person.phone
= link_to "Edit", edit_profile_company_person_path(@company_person), class: "btn btn-lg edit-profile-btn"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long. [109/90]

%td
%strong Phone
%td= @agency_person.phone
= link_to "Edit", edit_profile_agency_person_path(@agency_person), class: "btn btn-lg edit-profile-btn"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long. [107/90]


.my-profile-header {
font-size: 48px;
color: #0c7ba1;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line should be indented with spaces, not tabs
Color literals like #0c7ba1 should only be used in variable declarations; they should be referred to via variable everywhere else.

}

.my-profile-header {
font-size: 48px;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line should be indented with spaces, not tabs
Properties should be ordered color, font-size, font-weight, padding-bottom

width: 250px;
margin-top: 20px;
&:hover {
color: #fff;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Color literals like #fff should only be used in variable declarations; they should be referred to via variable everywhere else.

padding: 12px 16px;
width: 250px;
margin-top: 20px;
&:hover {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rule declaration should be preceded by an empty line
Line should be indented 2 spaces, but was indented 4 spaces

height: 50px;
padding: 12px 16px;
width: 250px;
margin-top: 20px;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line should be indented 2 spaces, but was indented 4 spaces

font-weight: bold;
height: 50px;
padding: 12px 16px;
width: 250px;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line should be indented 2 spaces, but was indented 4 spaces

Copy link
Contributor

@patmbolger patmbolger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Almost there - please see comments and also Lara's comment about centering the profile information on the page (horizontal centering).

@@ -96,6 +96,7 @@ def update
end

def home
logger.info("Person: #{pets_user.inspect}")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like a holdover from development(?)

%span.utc_to_local_time= @current_resume.updated_at
- else
You have no current resume
= link_to "Edit", edit_job_seeker_path(@jobseeker), class: "btn btn-lg edit-profile-btn"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're missing address in this view.

%td
%strong Address
%td= @jobseeker.address.street + ', ' + @jobseeker.address.city + ', ' + @jobseeker.address.zipcode
= link_to "Edit", edit_job_seeker_path(@jobseeker), class: "btn btn-lg edit-profile-btn"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long. [92/90]

%tr
%td
%strong Address
%td= @jobseeker.address.street + ', ' + @jobseeker.address.city + ', ' + @jobseeker.address.zipcode

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long. [111/90]

@patmbolger
Copy link
Contributor

Please make these changes to the profile view:

  1. For job seeker, add "status"

  2. For company person, add "address"

%td
%strong Status
%td= @jobseeker.status.short_description
= link_to "Edit", edit_job_seeker_path(@jobseeker), class: "btn btn-lg edit-profile-btn"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long. [92/90]

%td
%strong Address
%td= @company_person.address.street + ', ' + @company_person.address.city + ', ' + @company_person.address.zipcode
= link_to "Edit", edit_profile_company_person_path(@company_person), class: "btn btn-lg edit-profile-btn"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long. [109/90]

%tr
%td
%strong Address
%td= @company_person.address.street + ', ' + @company_person.address.city + ', ' + @company_person.address.zipcode

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long. [124/90]

@patmbolger patmbolger merged commit ec4edb1 into AgileVentures:development Feb 8, 2017
@joaopapereira joaopapereira mentioned this pull request Feb 13, 2017
joaopapereira added a commit that referenced this pull request Feb 15, 2017
* changed selenium to poltergeist tests

* converted tests to poltergeist

* added waits

* more waits

* added minimum expected for select find()

* reduce wait time

* increased poltergeist timeout param

* changed comment to prefer poltergeist over selenium

* added explicit labels for fields

* added back selenium for 2 scenarios

* backed out changes to jobs form

* changed tabs to spaces

* Closes AgileVentures/MetPlus_tracker#412 (#461)

* interim progress

* added task creation

* added policy test

* wip - adding tests

* more rspec tests

* added cuke test, renamed feature file

* removed cuke step

* rubocop fixes

* corrected action

* rubocop fixes

* added comment (#464)

* Closes AgileVentures/MetPlus_tracker#509 (#465)

* Add missing tests for OTHER JD APPLY

* Change to 2 spaces

* Closes AgileVentures/MetPlus_tracker#500 (#468)

Refactor create and update in jobs_controller

* Closes AgileVentures/MetPlus_tracker#487 refactor download resume (#456)

* Add step file

* pre-fetch commit

* For Pull Request

* re-commit

* Active Jobs

* AR Not Found Exception

* removed unused instance variable

* Closes AgileVentures/MetPlus_tracker#508 (#466)

* parameter for agency admin email

* remove rspec example file

* corrected from-address

* add counter_cache to job_skills

* add test to skill_spec

* update houndci violations

* made all emails valid for cuke tests

* added wait for 2 tests

* removed 100 year old birth date from test

* increased capybara wait time

* jobseeker notifications

* changes to event.rb

* add notification to jobseeker

* fixing errors

* rubocop implement

* remove extra spaces

* added new method app for job

* created new jobseeker mailer revoke

* added event

* add method jobseekermailer

* Created new jonseeker preview mailer

* Remove spaces

* rubo implement

* Resolve rubo issues

* updates for spec

* Resolve issues rspec test

* migrate seed and updates event

* removed Factory creation

* Resolved conflicts

* changes for jobseeker templateview

* fix rspec test

* Resolved mergeconflicts

* Add action for job developer to match job seekers against a job

* Add job policy and policy specs

* Refactor code and fix rubocop violations

* Handle nil job_seeker_ids

Fixes the issue when a user bypasses the javascript validation and force submits the form
without selecting a job seeker

* Add controller tests

* Fixed rspec test

* removed 100 year old birth date from test

* increased capybara wait time

* Remove job category placeholder from job_info view closes issue #498

* Resolve bug caused when agency person updates his/her email address

Fix minor rubocop warnings in controller and controller spec

* Add cuke tests

* Flash message when updating email address (#477)

* added crucher stub files (#475)

* added crucher stub files

* updates and rebase code

* fixed errors

* UI Assets (#481)

* 506 company person profile update (#476)

* Add step file

* pre-fetch commit

* For Pull Request

* re-commit

* Active Jobs

* AR Not Found Exception

* removed unused instance variable

* 506 PR

* remover byebug from email validator

* fixed job_seeker_spec dob validation

* Changed Flash message for Company person email update

* company people rspec

* Closes AgileVentures/MetPlus_tracker#522 (#479)

* Change from Update Agency Person/Update Company Person to Update Profile

* fix failing cucumber tests

* Closes AgileVentures/MetPlus_tracker#477 (#459)

* Closes AgileVentures/MetPlus_tracker#477

* update reviews from PR

* handle nil jobseeker address attributes

* make address_is_empty method take a parameter
Makes it clear we are checking job_seeker_params for presence of address
attributes

* test address attributes for job_seeker while editing

* resolve merge conflict

* make tests pass

* WIP: speed up cucumber tests (#487)

* added code from website one

* db clean strategy, refactor cuke scenarios

* changes to speed up cuke tests

* Closes AgileVentures/MetPlus_tracker#533 (#488)

* added wait for XHR request completion

* increased wait time

* Stub external services (#483)

* fixed spelling of raise (#489)

* Js update 517 (#485)

* updates for js

* updates for seed and job_seeker feature

* fixed links

* updates for jsfeature
patmbolger pushed a commit that referenced this pull request Feb 17, 2017
* Closes AgileVentures/MetPlus_tracker#476 (#448)

* non-agency person redirected if trying to access agency admin home page

* adjustments on non-agency person redirected if trying to access agency admin home page

* correct AgencyPolicy#update? method

* Closes AgileVentures/MetPlus_tracker#441 (#446)

* remove company_person's hidden_tag when create job

* combine _compact_list,_list_all to _list_jobs & update jobs_controller & jobs_viewer

* improve jobs_controller readability

* initial change to spec files

* initial commit on authorize job

* update authorize job policy & spec files

* add pending test

* update address factory

* initial clean up view/jobs

* correct indentation error

* update broken view

* correct mistake

* update jobs_controller_spec

* update houndci

* update company_registrations spec files

* update job features

* update houndci

* update houndci

* update job_application_viewer after houndci updates

* update spec & feature files

* update feature file

* initial review change

* complete review changes

* clean up codes

* clear houndci

* update to pass feature test

* update job_policy_spec

* Closes AgileVentures/MetPlus_tracker#496

fix postgresql migrations (#450)

* Closes AgileVentures/MetPlus_tracker#479 (#440)

* Setup Jasmine for JavaScript Testing

* Add spec file for testing
Remove duplicated jasmine gem

* Setup test for UTC to Local time

* Add test for UTC to Local time

* Add var before ele and define var top of page

* update to fix failing scenario

* Closes AgileVentures/MetPlus_tracker#478 (#447)

* update _applied_jobs_list partial

* fix failing features

* change indent tabs to spaces

* fix failing spec

* fix failing features

* fix failing view_job_application.feature

* update job_seekers_controller

* dry code in job_application_viewer

* update houndci

* update job_application.feature

* Add step file

* changed selenium to poltergeist tests

* pre-fetch commit

* Closes AgileVentures/MetPlus_tracker#281 Refactor eleigible job seeker to job seeker assigned (#451)

* Refactor eleigible job seeker to job seeker assigned

* Fixes hound errors

* Refactor space issues

* converted tests to poltergeist

* added waits

* more waits

* added minimum expected for select find()

* reduce wait time

* increased poltergeist timeout param

* changed comment to prefer poltergeist over selenium

* added explicit labels for fields

* Closes AgileVentures/MetPlus_tracker#462 (#455)

* fix git merge conflict

* Adds Jasmine test for job_applications.js

* Corrects filname error and rearranges spec

* added back selenium for 2 scenarios

* Closes AgileVentures/MetPlus_tracker#411 (#452)

* interim progress

* interim progress

* interim progress

* added tests for instance method, rubocop fixes

* added spinner

* controller tests

* added auth tests

* rspec controller tests

* rubocop fixes

* rubocop fixes

* houndci fixes job.css

* more houndci fixes

* yet more houndci fixes

* backed out changes to jobs form

* changed tabs to spaces

* For Pull Request

* Closes AgileVentures/MetPlus_tracker#412 (#461)

* interim progress

* added task creation

* added policy test

* wip - adding tests

* more rspec tests

* added cuke test, renamed feature file

* removed cuke step

* rubocop fixes

* corrected action

* rubocop fixes

* added comment (#464)

* re-commit

* Active Jobs

* AR Not Found Exception

* removed unused instance variable

* Closes AgileVentures/MetPlus_tracker#509 (#465)

* Add missing tests for OTHER JD APPLY

* Change to 2 spaces

* Closes AgileVentures/MetPlus_tracker#500 (#468)

Refactor create and update in jobs_controller

* Closes AgileVentures/MetPlus_tracker#508 (#466)

* parameter for agency admin email

* remove rspec example file

* corrected from-address

* 506 PR

* add counter_cache to job_skills

* add test to skill_spec

* update houndci violations

*  ignore example.txt and Editor file

* added wait for 2 tests

* removed 100 year old birth date from test

* jobseeker notifications

* changes to event.rb

* add notification to jobseeker

* fixing errors

* rubocop implement

* remove extra spaces

* added new method app for job

* created new jobseeker mailer revoke

* added event

* add method jobseekermailer

* Created new jonseeker preview mailer

* Remove spaces

* rubo implement

* Add action for job developer to match job seekers against a job

* Resolve rubo issues

* updates for spec

* Resolve issues rspec test

* Add job policy and policy specs

* Refactor code and fix rubocop violations

* migrate seed and updates event

* removed Factory creation

* Resolved conflicts

* changes for jobseeker templateview

* Handle nil job_seeker_ids

Fixes the issue when a user bypasses the javascript validation and force submits the form
without selecting a job seeker

* Add controller tests

* fix rspec test

* Resolved mergeconflicts

* increased capybara wait time

* Fixed rspec test

* Add cuke tests

* Resolve bug caused when agency person updates his/her email address

Fix minor rubocop warnings in controller and controller spec

* Remove job category placeholder from job_info view closes issue #498

* Flash message when updating email address (#477)

* added crucher stub files (#475)

* added crucher stub files

* updates and rebase code

* fixed errors

* Changed Flash message for Company person email update

* UI Assets (#481)

* company people rspec

* All changes for #514 pull request

* push changes

* prior to pul request

* Corrected Jobs Search Feature Tests

* Corrected HoundCI issues

* Cucumber File fix

* Rebase to origin

* restored company jobs edit revoke list

* fixed some hound issues

* semaphore corrections

* corrected jobs_controller_spec tests

* some index.html.haml hound issues

* changes to footer

* removal of company_jobs list

* remove edit and revoke buttons from jobs search list

* git hound corrections

* corrections to features

* corrections to jobs_steps.rb and layout/_footer.html.haml

* corrections to jobs_controller and _search_job.html.haml

* fixed layouts/_footer.html.haml
@hin101 hin101 deleted the my_profile_page_#520 branch October 10, 2017 10:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants