Skip to content

Commit 25cce53

Browse files
Mutugiiidogi
andauthored
manager: smoother myplanet reports (fixes #9114) (#9116)
Co-authored-by: dogi <[email protected]>
1 parent bb08ff4 commit 25cce53

13 files changed

+33
-33
lines changed

β€Žpackage.jsonβ€Ž

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "planet",
33
"license": "AGPL-3.0",
4-
"version": "0.20.27",
4+
"version": "0.20.28",
55
"myplanet": {
6-
"latest": "v0.31.67",
7-
"min": "v0.30.67"
6+
"latest": "v0.31.96",
7+
"min": "v0.30.96"
88
},
99
"scripts": {
1010
"ng": "ng",

β€Žsrc/app/home/home.module.tsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { UpgradeComponent } from '../upgrade/upgrade.component';
1717
import { SharedComponentsModule } from '../shared/shared-components.module';
1818
import { UsersAchievementsModule } from '../users/users-achievements/users-achievements.module';
1919
import { NewsModule } from '../news/news.module';
20-
import { LogsMyPlanetComponent } from '../manager-dashboard/reports/logs-myplanet.component';
20+
import { LogsMyPlanetComponent } from '../manager-dashboard/reports/myplanet/logs-myplanet.component';
2121
import { TeamsModule } from '../teams/teams.module';
2222
import { CommunityComponent } from '../community/community.component';
2323
import { PlanetCalendarModule } from '../shared/calendar.module';

β€Žsrc/app/manager-dashboard/manager-dashboard-router.module.tsβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import { ManagerDashboardConfigurationComponent } from './manager-dashboard-conf
88
import { ReportsComponent } from './reports/reports.component';
99
import { ReportsDetailComponent } from './reports/reports-detail.component';
1010
import { ReportsPendingComponent } from './reports/reports-pending.component';
11-
import { ReportsMyPlanetComponent } from './reports/reports-myplanet.component';
11+
import { ReportsMyPlanetComponent } from './reports/myplanet/reports-myplanet.component';
1212
import { RequestsComponent } from './requests/requests.component';
13-
import { LogsMyPlanetComponent } from './reports/logs-myplanet.component';
13+
import { LogsMyPlanetComponent } from './reports/myplanet/logs-myplanet.component';
1414

1515
const routes: Routes = [
1616
{ path: '', component: ManagerDashboardComponent },

β€Žsrc/app/manager-dashboard/manager-dashboard.module.tsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { ReportsTableComponent } from './reports/reports-table.component';
1919
import { ReportsDetailComponent } from './reports/reports-detail.component';
2020
import { ReportsPendingComponent } from './reports/reports-pending.component';
2121
import { PendingTableComponent } from './reports/pending-table.component';
22-
import { ReportsMyPlanetComponent } from './reports/reports-myplanet.component';
22+
import { ReportsMyPlanetComponent } from './reports/myplanet/reports-myplanet.component';
2323
import { SharedComponentsModule } from '../shared/shared-components.module';
2424
import { ReportsDetailActivitiesComponent } from './reports/reports-detail-activities.component';
2525
import { ReportsHealthComponent } from './reports/reports-health.component';

β€Žsrc/app/manager-dashboard/reports/logs-myplanet.component.scssβ€Ž renamed to β€Žsrc/app/manager-dashboard/reports/myplanet/logs-myplanet.component.scssβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import '../../variables';
1+
@import '../../../variables';
22

33
$screen-md: 1300px;
44

β€Žsrc/app/manager-dashboard/reports/logs-myplanet.component.tsβ€Ž renamed to β€Žsrc/app/manager-dashboard/reports/myplanet/logs-myplanet.component.tsβ€Ž

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import { Component, OnInit, HostListener } from '@angular/core';
22
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
33
import { forkJoin } from 'rxjs';
4-
import { CouchService } from '../../shared/couchdb.service';
5-
import { StateService } from '../../shared/state.service';
6-
import { PlanetMessageService } from '../../shared/planet-message.service';
7-
import { ManagerService } from '../manager.service';
8-
import { filterSpecificFields } from '../../shared/table-helpers';
9-
import { attachNamesToPlanets, areNoChildren, filterByDate } from './reports.utils';
10-
import { CsvService } from '../../shared/csv.service';
11-
import { DeviceInfoService, DeviceType } from '../../shared/device-info.service';
12-
import { ReportsService } from './reports.service';
4+
import { CouchService } from '../../../shared/couchdb.service';
5+
import { StateService } from '../../../shared/state.service';
6+
import { PlanetMessageService } from '../../../shared/planet-message.service';
7+
import { ManagerService } from '../../manager.service';
8+
import { filterSpecificFields } from '../../../shared/table-helpers';
9+
import { attachNamesToPlanets, areNoChildren, filterByDate } from '../reports.utils';
10+
import { CsvService } from '../../../shared/csv.service';
11+
import { DeviceInfoService, DeviceType } from '../../../shared/device-info.service';
12+
import { ReportsService } from '../reports.service';
1313

1414
@Component({
1515
templateUrl: './logs-myplanet.component.html',

β€Žsrc/app/manager-dashboard/reports/myplanet-table.component.tsβ€Ž renamed to β€Žsrc/app/manager-dashboard/reports/myplanet/myplanet-table.component.tsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { MatPaginator } from '@angular/material/paginator';
33
import { MatSort } from '@angular/material/sort';
44
import { MatTableDataSource } from '@angular/material/table';
55
import { MatDialog } from '@angular/material/dialog';
6-
import { DialogsViewComponent } from '../../shared/dialogs/dialogs-view.component';
6+
import { DialogsViewComponent } from '../../../shared/dialogs/dialogs-view.component';
77

88
@Component({
99
selector: 'planet-myplanet-table',

0 commit comments

Comments
Β (0)