Skip to content

571 ui list trending technologies #577

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 16 commits into from
Dec 15, 2020
Merged

571 ui list trending technologies #577

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6cd51af
feat: #571 technology report
scastillo-jp Nov 16, 2020
6d17a87
feat: #571 technology report - move componente TimeTange to shared
scastillo-jp Nov 16, 2020
07c130e
feat: #571 technology report - test create component
scastillo-jp Nov 16, 2020
6cff3df
feat: #571 mock data
scastillo-jp Nov 17, 2020
2170c89
fix: #571 update async for waitForAsync
scastillo-jp Nov 18, 2020
ed579b6
fix: #571 test coverage
scastillo-jp Nov 19, 2020
0e86804
TT-52 feat: add toggle flag
Angeluz-07 Dec 2, 2020
6f4a168
TT-52 feat: update previous test
Angeluz-07 Dec 2, 2020
29bbfa7
TT-52 feat: remove print
Angeluz-07 Dec 2, 2020
20f8679
TT-52 feat: unit tests for feature flag ui-list-technologies
Angeluz-07 Dec 4, 2020
e489731
TT-52 feat: include route in the feature toggle
Angeluz-07 Dec 9, 2020
13967e6
TT-52 feat: consider global toggle state
Angeluz-07 Dec 11, 2020
2965e16
TT-52 feat: update aync methods in user components
Angeluz-07 Dec 11, 2020
fe6a733
TT-52 feat: remove errors due to rebase
Angeluz-07 Dec 11, 2020
56283c6
TT-52 feat: CI test
Angeluz-07 Dec 14, 2020
a9150e6
ci: update workflow
Angeluz-07 Dec 15, 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
Prev Previous commit
Next Next commit
feat: #571 mock data
  • Loading branch information
@scastillo-jp @Angeluz-07
scastillo-jp authored and Angeluz-07 committed Dec 11, 2020
commit 6cff3df36ca2b13db3446763d223de22f21b1801
4 changes: 3 additions & 1 deletion angular.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
],
"styles": [
"node_modules/datatables.net-dt/css/jquery.dataTables.css",
"node_modules/datatables.net-responsive-dt/css/responsive.dataTables.css",
"./node_modules/bootstrap/dist/css/bootstrap.min.css",
"src/styles.scss",
"node_modules/ngx-toastr/toastr.css",
Expand All @@ -39,7 +40,8 @@
"node_modules/datatables.net-buttons/js/buttons.colVis.js",
"node_modules/datatables.net-buttons/js/buttons.flash.js",
"node_modules/datatables.net-buttons/js/buttons.html5.js",
"node_modules/datatables.net-buttons/js/buttons.print.js"
"node_modules/datatables.net-buttons/js/buttons.print.js",
"node_modules/datatables.net-responsive/js/dataTables.responsive.js"
]
},
"configurations": {
Expand Down
80 changes: 54 additions & 26 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
"datatables.net-buttons": "^1.6.2",
"datatables.net-buttons-dt": "^1.6.2",
"datatables.net-dt": "^1.10.21",
"datatables.net-responsive": "^2.2.6",
"datatables.net-responsive-dt": "^2.2.6",
"jquery": "^3.5.1",
"jszip": "^3.4.0",
"minimist": "^1.2.5",
Expand Down
27 changes: 27 additions & 0 deletions src/app/modules/technology-report/components/technology-report-table/data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"data": [
{
"technology": [
{
"id": 1,
"name_technology": "Superman",
"users": [
{
"id": 1,
"email_user": "[email protected]",
"time_spent": 10,
"project": [
{
"id": "1",
"project_name": "Time tracker",
"time_spent": "8"
}
]
}
],
"time_spent": 10
}
]
}
]
}
4 changes: 2 additions & 2 deletions ...chnology-report/components/technology-report-table/technology-report-table.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<thead class="thead-blue">
<tr class="d-flex">
<th class="col md-col">User email</th>
<th class="col lg-col">Technology</th>
<th class="col x-sm-col" title="Duration (hours)">Time spend</th>
<th class="none" title="Duration (hours)">Time spend</th>
<th class="none">Technology</th>
</tr>
</thead>
<app-loading-bar
Expand Down
3 changes: 2 additions & 1 deletion ...technology-report/components/technology-report-table/technology-report-table.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ export class TechnologyReportTableComponent implements OnInit, OnDestroy, AfterV
text: 'CSV',
filename: `time-entries-${formatDate(new Date(), 'MM_dd_yyyy-HH_mm', 'en')}`
}
]
],
responsive: true
};
dtTrigger: Subject<any> = new Subject();
@ViewChild(DataTableDirective, { static: false })
Expand Down