Conversation
…ekly-time-tracking
fixed root page tests. renamed "invoice-tab" to "invoices-tab"
…ekly-time-tracking
Contributor
|
@apoorv1316 Please test this to ensure all of the feedback provided is incorporated. |
Collaborator
|
@Abinash393 also resolve conflicts |
Contributor
|
@Abinash393 please rebase |
Contributor
Author
* Owner or admin can add clients for a company * Avoid instance vars in views, pass local vars instead * Pass local vars to views and toggle new client view display based on validation errors * Fix UI and support country and timezone * Configure failure and success messages via locales * Show total hours logged for each client * Fix eslint err * Remove memoization for client * Keep autofocus only on name * Refactor client specs * Bifurcate validations and associations into different describe blocks * Camelize hash keys when sending to react component * Use locales for labels * Extract clients hash merge into a method and split long exp into multiple lines * Add placeholders for input fields, fix dialog header text and fix locales * DRY up the styling * Follow BEM style * Replace with correct class * Fix model spec * Follow BEM style * Set company_id with other params * Fix class names * Move toaster to bottom center with a close button * Fix robocop issues * Config modal width as per design * Fix FactoryBot for client
supriya3105
approved these changes
May 5, 2022
Collaborator
|
@supriya3105 On selecting a country we can only see the timezones of that selected country only. Is that okay? |
Contributor
|
@abinashpa merging this for now. please raise separate PR to make eastern central time as default timezone when country selected is US. |
vipulnsward
pushed a commit
that referenced
this pull request
Feb 15, 2026
* checkbox icons added * checking if project exist * fixed typo * spec/models/timesheet_entry_spec.rb updated * initial commit * weekly component * ui refactored * removed update_project controller * removed update_project controller * code refactor * crashing issue fix * try catch added in exios request * code refactor * DatesInWeek.tsx component added * minor ui changes * multiple edit entry bug fixes * rubocop issue fixed * removed note validation from rspec * large client, project name UI fixed * invoice spec update on invoice.due_date * fix invoices datacy label typo fixed root page tests. renamed "invoice-tab" to "invoices-tab" * migration for note added * interchange save & cancel button in SelectProject.tsx * initial commit * calendar added * useEffect for dayInfo to entryList * Akash's changes added * html entity added * daily & monthly sync * total daily hours patch added * patch added * patch added * restored duration validation * fixed starting day in week * changed variable names in hhmm-parser.ts * auto resize textarea added * default values added * added functionality in org edit page * added functionality in org edit page * Owner or admin can add clients for a company (#126) * Owner or admin can add clients for a company * Avoid instance vars in views, pass local vars instead * Pass local vars to views and toggle new client view display based on validation errors * Fix UI and support country and timezone * Configure failure and success messages via locales * Show total hours logged for each client * Fix eslint err * Remove memoization for client * Keep autofocus only on name * Refactor client specs * Bifurcate validations and associations into different describe blocks * Camelize hash keys when sending to react component * Use locales for labels * Extract clients hash merge into a method and split long exp into multiple lines * Add placeholders for input fields, fix dialog header text and fix locales * DRY up the styling * Follow BEM style * Replace with correct class * Fix model spec * Follow BEM style * Set company_id with other params * Fix class names * Move toaster to bottom center with a close button * Fix robocop issues * Config modal width as per design * Fix FactoryBot for client * conflicts resolved * revert new changes * restored client controller Co-authored-by: Mohini Dahiya <[email protected]> Co-authored-by: Apoorv Mishra <[email protected]>
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
4 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.
Notion card
Summary
Loom
Preview
Type of change
Please delete options that are not relevant.
not work as expected)
How Has This Been Tested?
Checklist: