Skip to content

413 Improving styles on the project component #458

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 2 commits into from
Jul 2, 2020
Merged

413 Improving styles on the project component #458

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
263a1f1
feat: #447 Updating date format on report page
Jul 1, 2020
5e7b9e8
feat: #413 Improving styles for project component
Jul 2, 2020
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
Next Next commit
feat: #447 Updating date format on report page
  • Loading branch information
Juan Gabriel Guzman committed Jul 1, 2020
commit 263a1f1e9e3f43617a70d6e75d469ae97daaf2ad
2 changes: 1 addition & 1 deletion src/app/modules/reports/components/time-entries-table/time-entries-table.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*ngFor="let entry of data"
>
<td class="col md-col multiline-col"> {{ entry.owner_email }} </td>
<td class="col sm-col"> {{ entry.start_date | date: 'dd/MM/yyyy' }} </td>
<td class="col sm-col"> {{ entry.start_date | date: 'MM/dd/yyyy' }} </td>
<td class="col sm-col"> {{ entry.end_date | substractDate: entry.start_date }} </td>
<td class="col md-col"> {{ entry.project_name }} </td>
<td class="col md-col"> {{ entry.activity_name }} </td>
Expand Down
6 changes: 2 additions & 4 deletions src/app/modules/reports/components/time-entries-table/time-entries-table.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ import {DataTableDirective} from 'angular-datatables';
styleUrls: ['./time-entries-table.component.scss']
})
export class TimeEntriesTableComponent implements OnInit, OnDestroy, AfterViewInit {

data = [];
const;
dtOptions: any = {
scrollY: '600px',
paging: false,
Expand All @@ -25,12 +23,12 @@ export class TimeEntriesTableComponent implements OnInit, OnDestroy, AfterViewIn
{
extend: 'excel',
text: 'Excel',
filename: `time-entries-${ formatDate(new Date(), 'yyyy_MM_dd-hh_mm', 'en') }`
filename: `time-entries-${ formatDate(new Date(), 'MM_dd_yyyy-HH_mm', 'en') }`
},
{
extend: 'csv',
text: 'CSV',
filename: `time-entries-${ formatDate(new Date(), 'yyyy_MM_dd-hh_mm', 'en') }`
filename: `time-entries-${formatDate(new Date(), 'MM_dd_yyyy-HH_mm', 'en') }`
}
]
};
Expand Down