Skip to content

fix: 📱 make summary elements responsive #527 #530

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Oct 12, 2020
Merged

fix: 📱 make summary elements responsive #527 #530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix: make summary elements responsive #527
  • Loading branch information
@Angeluz-07
Angeluz-07 committed Oct 10, 2020
commit 3be4421ddebf7cdaf7b5947b47535dddfc7d7ba6
2 changes: 1 addition & 1 deletion src/app/modules/shared/components/details-fields/details-fields.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
}

onSelectedProject(item) {
this.projectSelected.emit({'projectId': item.id});
this.projectSelected.emit({ projectId : item.id});
this.entryForm.patchValue(
{
project_id: item.id,
Expand Down
34 changes: 18 additions & 16 deletions ...pp/modules/time-clock/components/time-entries-summary/time-entries-summary.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
<h6 class="text-left"><strong>Summary</strong></h6>
<hr />
<div class="row pb-4">
<div class="col-3">
<h6>Current</h6>
<h3>{{ currentWorkingTime }}</h3>
</div>
<div class="col-3">
<h6>Day</h6>
<h3>{{ timeEntriesSummary?.day | timeDetails }}</h3>
</div>
<div class="col-3">
<h6>Week</h6>
<h3>{{ timeEntriesSummary?.week | timeDetails }}</h3>
</div>
<div class="col-3">
<h6>Month</h6>
<h3>{{ timeEntriesSummary?.month | timeDetails }}</h3>
<div class ="container px-0">
<div class="row pb-4">
<div class="col-12 col-sm-3">
<h6>Current</h6>
<h3>{{ currentWorkingTime }}</h3>
</div>
<div class="col-12 col-sm-3">
<h6>Day</h6>
<h3>{{ timeEntriesSummary?.day | timeDetails }}</h3>
</div>
<div class="col-12 col-sm-3">
<h6>Week</h6>
<h3>{{ timeEntriesSummary?.week | timeDetails }}</h3>
</div>
<div class="col-12 col-sm-3">
<h6>Month</h6>
<h3>{{ timeEntriesSummary?.month | timeDetails }}</h3>
</div>
</div>
</div>
2 changes: 1 addition & 1 deletion src/app/modules/time-entries/pages/time-entries.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ describe('TimeEntriesComponent', () => {
state.timeEntriesDataSource.data = [ lastEntry ];
mockEntriesSelector = store.overrideSelector(getTimeEntriesDataSource, state.timeEntriesDataSource);

component.projectSelected({'projectId' : 'id'});
component.projectSelected({ projectId : 'id'});
expect(component.entry).toEqual(lastEntry);
}));

Expand Down