Skip to content
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.

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

Enhancement - APP + API - Nueva página de inicio #159

Merged
merged 83 commits into from
Sep 16, 2024
Merged
Changes from 1 commit
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
9c54353
wip
juanSTIC Dec 4, 2023
c89a8c3
wip
juanSTIC Dec 4, 2023
91e2708
tunning
juanSTIC Dec 4, 2023
c6e261b
tune
juanSTIC Dec 4, 2023
c5e3209
Merge branch 'reporting' into enhancement/home2
juanSTIC Jun 4, 2024
a93980c
Merge branch 'reporting' into enhancement/home2
juanSTIC Jun 13, 2024
c820198
wip
juanSTIC Jun 14, 2024
79c66b0
wip
juanSTIC Jun 17, 2024
cd4c975
Merge branch 'reporting' into enhancement/home2
juanSTIC Jun 24, 2024
02cc085
sorted & optimize
juanSTIC Jun 24, 2024
a3f3cf5
card mode & persist & public URL
juanSTIC Jun 25, 2024
04d05b9
icon colors
juanSTIC Jun 25, 2024
fe6e37b
defaulr route
juanSTIC Jun 25, 2024
e0cedcf
get user info in all cases
juanSTIC Jun 25, 2024
6a33dd8
description
juanSTIC Jun 25, 2024
9d0417e
clone reports
juanSTIC Jun 26, 2024
509e6d3
new date at clone & filter after clone
juanSTIC Jun 26, 2024
fe495bc
date created & copy URL
juanSTIC Jun 27, 2024
b289d70
wip
juanSTIC Jun 28, 2024
01335e1
wip
juanSTIC Jun 28, 2024
55d90d1
localize
juanSTIC Jun 28, 2024
619cebe
tunning
juanSTIC Jun 28, 2024
59b0e92
Merge branch 'reporting' into enhancement/home2
juanSTIC Jul 15, 2024
3f1da8a
format
juanSTIC Jul 15, 2024
71e8b12
report visbility & filter indicator
juanSTIC Jul 15, 2024
1d35a4d
label translations
juanSTIC Jul 15, 2024
71bf4a3
create new report button & add createAt
juanSTIC Jul 15, 2024
25a1e4d
tunning
juanSTIC Jul 15, 2024
f738382
tittle short
juanSTIC Jul 16, 2024
9b2b111
title edit in card
juanSTIC Jul 16, 2024
30bfc95
reaply filter after delete
juanSTIC Jul 16, 2024
7b1b169
Merge branch 'reporting' into enhancement/home2
juanSTIC Jul 24, 2024
0c38015
remove todo
juanSTIC Aug 19, 2024
0dfe3a0
normalize buttons
juanSTIC Aug 19, 2024
9097c11
edit type in panel
juanSTIC Aug 19, 2024
b29f460
fine type change
juanSTIC Aug 20, 2024
d96545e
edit fix
juanSTIC Aug 20, 2024
e50d9c6
remove reoerder after change type
juanSTIC Aug 21, 2024
c1aa9ab
get DS name
juanSTIC Aug 21, 2024
26a9f11
ds info & change type in table
juanSTIC Aug 21, 2024
3b30762
modifiedAt, & some enhancements
juanSTIC Aug 22, 2024
462dcd6
label groups visualization
juanSTIC Aug 22, 2024
a7db4b2
reorde toolbar
juanSTIC Aug 23, 2024
3e9542c
wip
juanSTIC Sep 3, 2024
02fe2bc
table name edit & show descrption
juanSTIC Sep 3, 2024
c739b9f
enhancement events
juanSTIC Sep 3, 2024
72cb1c0
auto active type component
juanSTIC Sep 3, 2024
061394b
filter tags enhancements
juanSTIC Sep 4, 2024
b5f4132
group indicator & icon
juanSTIC Sep 4, 2024
271239e
fix group filter
juanSTIC Sep 4, 2024
536ea20
reorder
juanSTIC Sep 4, 2024
d81dbbf
fix name deleting contents
juanSTIC Sep 5, 2024
e6d9a0f
do not sort after filter
juanSTIC Sep 5, 2024
5c184ff
i18n fixes
juanSTIC Sep 5, 2024
e2fd44e
icon change
juanSTIC Sep 5, 2024
1ba4c90
document
juanSTIC Sep 5, 2024
62dccf9
format files
juanSTIC Sep 5, 2024
fee35aa
Merge branch 'reporting' into enhancement/home2
juanSTIC Sep 5, 2024
997c52c
fix labels
juanSTIC Sep 6, 2024
0152a66
fix label
juanSTIC Sep 6, 2024
9be2169
new type filter
juanSTIC Sep 6, 2024
0c5231e
remove filters
juanSTIC Sep 6, 2024
866bad4
links enhancements
juanSTIC Sep 6, 2024
c8a910a
vsual changes
juanSTIC Sep 6, 2024
cfc0b4f
fix private edition sort
juanSTIC Sep 6, 2024
61c2e41
ensure visibility to no admin users
juanSTIC Sep 6, 2024
3c0bd54
no admin users can see groups
juanSTIC Sep 6, 2024
4b1476e
show author to no admin users
juanSTIC Sep 6, 2024
176cd39
no admin can clone
juanSTIC Sep 6, 2024
867fd97
oficial colors
juanSTIC Sep 6, 2024
5c6cf5b
fix public url copy
juanSTIC Sep 9, 2024
0b8800b
rename component
juanSTIC Sep 10, 2024
81e0a59
rm console log
juanSTIC Sep 10, 2024
747e33f
Improving translation
jalbaiges Sep 10, 2024
fb70175
Improving translation
jalbaiges Sep 10, 2024
db46e77
Improving translation
jalbaiges Sep 10, 2024
8e2a5b1
Improving translation
jalbaiges Sep 10, 2024
41b50ca
avoid no admin users change type to public (shared)
juanSTIC Sep 12, 2024
5a61851
fix https://github.com/SinergiaTIC/SinergiaDA/pull/159#pullrequestrev…
juanSTIC Sep 12, 2024
be5fdad
Improving translation
jalbaiges Sep 13, 2024
42a8f71
Improving translation
jalbaiges Sep 13, 2024
8b6a5e8
Improving translation
jalbaiges Sep 13, 2024
bf40db3
Improving translation
jalbaiges Sep 13, 2024
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
wip
juanSTIC committed Dec 4, 2023
commit 9c543536ad4fd1a5aa7b6de00c7faa9f5ba36124
4 changes: 3 additions & 1 deletion eda/eda_app/src/app/module/pages/pages.module.ts
Original file line number Diff line number Diff line change
@@ -42,6 +42,7 @@ import { CalculatedColumnDialogComponent } from './data-sources/data-source-deta
import { UploadFileComponent } from './data-sources/data-source-detail/upload-file/upload-file.component';
import { SaveAsDialogComponent } from './dashboard/saveAsDialog/save-as-dialog.component';
import { EditStylesDialogComponent } from './dashboard/edit-styles-dialog/edit-styles.dialog.component';
import { SdareportsComponent } from './sdareports/sdareports.component';

@NgModule({
imports: [
@@ -83,7 +84,8 @@ import { EditStylesDialogComponent } from './dashboard/edit-styles-dialog/edit-s
MailManagementComponent,
DashboardMailDialogComponent,
SaveAsDialogComponent,
EditStylesDialogComponent
EditStylesDialogComponent,
SdareportsComponent
]
})
export class PagesModule { }
3 changes: 3 additions & 0 deletions eda/eda_app/src/app/module/pages/pages.routes.ts
Original file line number Diff line number Diff line change
@@ -9,6 +9,8 @@ import { UsersLlistaComponent } from './users-management/users-list/users-list.c
import { DsConfigWrapperComponent } from './data-sources/dsconfig-wrapper.component'
import { DataSourceListComponent } from './data-sources/data-source-list/data-source-list.component';
import { ModelSettingsComponent } from './model-settings/model-settings.component';
import { SdareportsComponent } from './sdareports/sdareports.component';



// Guard
@@ -21,6 +23,7 @@ import { MailManagementComponent } from './mail-management/mail-management.compo
const pagesRoutes: Routes = [

{ path: 'home', component: HomeComponent, canActivate: [VerifyTokenGuard] },
{ path: 'sdareports', component: SdareportsComponent, canActivate: [VerifyTokenGuard] },
{ path: 'dashboard/:id', component: DashboardComponent, canActivate: [VerifyTokenGuard] },
{ path: 'account-settings', component: AccountSettingsComponent, canActivate: [VerifyTokenGuard] },
{ path: 'profile', component: ProfileComponent, canActivate: [VerifyTokenGuard] },
Empty file.
201 changes: 201 additions & 0 deletions eda/eda_app/src/app/module/pages/sdareports/sdareports.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
<div class="grid animated fadeIn">
<div *ngIf="!isObserver" class="col-12" id="div_new_dashboard">
<button
type="button"
class="btn btn-dark d-flex justify-content-center"
(click)="initDialog()"
>
<i class="fa fa-plus-circle mr-2"></i>
<span i18n="@@tituloNuevoInforme">CREAR UN NUEVO INFORME</span>
</button>
</div>

<div class="col-12" *ngIf="tags.length !== 2" >
<div class="d-flex align-items-center bg-light p-2">
<span class="font-weight-bold mr-2">Tags:</span>
<div class="btn-group" role="group">
<button
type="button"
class="btn btn-outline-primary"
*ngFor="let tag of tags"
[class.active]="selectedTag === tag.value || (tag.value === null && selectedTag === 0)"
(click)="filterDashboards(tag)"
>
{{ tag.label }}
</button>
</div>
</div>
</div>


<!-- Buscador -->
<div
class="col-12 ml-3"
*ngIf="filteringByName || visibleDashboards.publics.length > 3 || visibleDashboards.grups.length > 3 || visibleDashboards.privats.length > 3"
style="margin-top: 0em;"
>
<div class="input-group">
<input
type="text"
class="form-control pl-5"
id="buscador"
name="buscador"
(keyup)="filterTitle($event)"
i18n-placeholder="@@buscarPorNombre"
placeholder="Buscar por nombre del informe"
/>
<div class="input-group-prepend">
<span class="input-group-text border-0 bg-transparent position-absolute" style="left: 10px;">
<i class="fa fa-search"></i>
</span>
</div>
</div>
</div>




<!-- PUBLICS -->
<div class="col-12 lg:col-3" id="public-list">
<h4 i18n="@@tituloGrupoPublicos" class="visibility-segment">PUBLICOS</h4>

<div
*ngFor="let dashboard of visibleDashboards.shared"
class="col-12 md:col-12 mb-2"
style="padding: 0px"
>
<eda-dashboard-panel>
<div class="d-flex justify-content-between align-items-end">
<h3 (click)="goToDashboard(dashboard)" class="pointer">
{{ dashboard.config.title }}
</h3>

<span
*ngIf="!isObserver && canIEdit(dashboard)"
(click)="deleteDashboard(dashboard)"
class="pointer"
>
<i class="fa fa-trash" style="font-size: 16px"></i>
</span>
</div>
</eda-dashboard-panel>
</div>
</div>
<!-- COMUN -->
<div class="col-12 lg:col-3" id="common-list">
<h4 i18n="@@tituloGrupoComunes" class="visibility-segment">COMUNES</h4>

<div
*ngFor="let dashboard of visibleDashboards.publics"
class="col-12 md:col-12 mb-2"
style="padding: 0px"
>
<eda-dashboard-panel>
<div class="d-flex justify-content-between align-items-end">
<h3 (click)="goToDashboard(dashboard)" class="pointer">
{{ dashboard.config.title }}
</h3>

<span
*ngIf="!isObserver && canIEdit(dashboard)"
(click)="deleteDashboard(dashboard)"
class="pointer"
>
<i class="fa fa-trash" style="font-size: 16px"></i>
</span>
</div>
</eda-dashboard-panel>
</div>
</div>
<!-- GROUPS -->
<div class="col-12 lg:col-3" id="group-list">
<h4 i18n="@@tituloGrupoMisGrupos" class="visibility-segment">MIS GRUPOS</h4>

<div *ngFor="let group of groups" class="col-12" style="padding: 0px">
<!-- <h6>{{group.name}}:</h6> -->

<div
*ngFor="
let dashboard of visibleDashboards.grups | ids : 'group' : group
"
class="col-12 md:col-12 mb-2"
style="padding: 0px"
>
<ng-container>
<eda-dashboard-panel>
<h3 (click)="goToDashboard(dashboard)" class="pointer">
{{ dashboard.config.title }}
</h3>

<div class="d-flex justify-content-between align-items-end">
<span style="text-align: left">{{
getGroupsNamesByDashboard(dashboard.group)
}}</span>

<span
*ngIf="!isObserver && canIEdit(dashboard)"
(click)="deleteDashboard(dashboard)"
class="pointer"
>
<i class="fa fa-trash" style="font-size: 16px"></i>
</span>
</div>
</eda-dashboard-panel>
</ng-container>
</div>
</div>
</div>
<!-- PRIVATES -->
<div class="col-12 lg:col-3" id="private-list">
<h4 i18n="@@tituloGrupoPersonales" class="visibility-segment">PRIVADOS</h4>

<div
*ngFor="let dashboard of visibleDashboards.privats"
class="col-12 md:col-12 mb-2"
style="padding: 0px"
>
<ng-container *ngIf="!isAdmin">
<eda-dashboard-panel>
<div class="d-flex justify-content-between align-items-end">
<h3 (click)="goToDashboard(dashboard)" class="pointer">
{{ dashboard.config.title }}
</h3>

<span
*ngIf="!isObserver && canIEdit(dashboard)"
(click)="deleteDashboard(dashboard)"
class="pointer"
>
<i class="fa fa-trash" style="font-size: 16px"></i>
</span>
</div>
</eda-dashboard-panel>
</ng-container>

<ng-container *ngIf="isAdmin">
<eda-dashboard-panel>
<h3 (click)="goToDashboard(dashboard)" class="pointer">
{{ dashboard.config.title }}
</h3>

<div class="d-flex justify-content-between align-items-end">
<span>{{ dashboard.user.name }}</span>

<span
*ngIf="!isObserver && canIEdit(dashboard)"
(click)="deleteDashboard(dashboard)"
class="pointer"
>
<i class="fa fa-trash" style="font-size: 16px"></i>
</span>
</div>
</eda-dashboard-panel>
</ng-container>
</div>
</div>
</div>

<app-create-dashboard
*ngIf="dashController"
[controller]="dashController"
></app-create-dashboard>
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';

import { SdareportsComponent } from './sdareports.component';

describe('SdareportsComponent', () => {
let component: SdareportsComponent;
let fixture: ComponentFixture<SdareportsComponent>;

beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ SdareportsComponent ]
})
.compileComponents();

fixture = TestBed.createComponent(SdareportsComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
});
Loading