spawntree
/
matsen-tool-fe
2
0
Креирај огранак 0
Код Дискусије 0 Захтеви за спајање 0 Издања 0 Вики Activity
Преглед изворни кода

small fix

master
Florian Eisenmenger пре 1 година
родитељ
c9ccaf490e
комит
8e12a77dfd
4 измењених фајлова са 129 додато и 77 уклоњено
Подељен поглед
Diff Options
Show Stats Download Patch File Download Diff File
  1. +82
    -75
      matsen-tool/src/app/home/home.component.html
  2. +1
    -1
      matsen-tool/src/app/partners/partners-detail/partners-detail.component.html
  3. +1
    -1
      matsen-tool/src/app/tasks/tasks.component.html
  4. +45
    -0
      matsen-tool/src/assets/scss/_basics.scss

+ 82
- 75
matsen-tool/src/app/home/home.component.html Прегледај датотеку

@@ -63,23 +63,26 @@
<div class="container spt-container">
<app-toggle #togglePosts [headline]="('user.my' | translate) + ' ' + ('basic.tasks' | translate)">
<div class="spt-accordion position-relative">
<button class="btn btn-primary toggle-btn" (click)="openModalNewTask()">{{'basic.new-task' | translate}}</button>
<button class="btn btn-primary toggle-btn"
(click)="openModalNewTask()">{{ 'basic.new-task' | translate }}
</button>
<div class="tasks mb-3" *ngFor="let task of tasks">
<div class="card p-3">
<div class="position-relative" data-bs-toggle="collapse" [attr.data-bs-target]="'#collapse-' + ApiConverter.extractId(task.id)"
<div class="spt-toggle position-relative collapsed" data-bs-toggle="collapse"
[attr.data-bs-target]="'#collapse-' + ApiConverter.extractId(task.id)"
aria-expanded="false"
aria-controls="collapseExample">
<h3 class="m-0">{{task.partnerName}}</h3>
<h3 class="m-0">{{ task.partnerName }}</h3>
<span class="info d-flex position-absolute">
<span class="due-date">{{ task.dueAt | date:'dd.MM.YYYY':'GMT+0000' }}</span>
<span class="importance" [attr.data-importance]="task.prio"></span>
</span>
<h2 class="m-0">{{task.headline}}</h2>
<span class="due-date">{{ task.dueAt | date:'dd.MM.YYYY':'GMT+0000' }}</span>
<span class="importance" [attr.data-importance]="task.prio"></span>
</span>
<h2 class="m-0">{{ task.headline }}</h2>
</div>
<div class="collapse" id="collapse-{{ApiConverter.extractId(task.id)}}">
<div class="pt-3 pe-5 position-relative">
<p class="m-0" [innerHTML]="apiConverter.getSafeLongtext(task.description)"></p>
<p>Zugewiesen an: {{task.assignedToName}}</p>
<p>Zugewiesen an: {{ task.assignedToName }}</p>
<span *ngIf="task.createdBy === user?.id" class="position-absolute bi bi-pencil p-2"
data-type="user-tool" data-action="edit" (click)="openModalEditTask(task)"></span>
</div>
@@ -96,7 +99,8 @@
<p>{{ taskNote.message }}</p>
</div>
<span *ngIf="taskNote.owner === user?.id" class="position-absolute bi bi-pencil p-2"
data-type="user-tool" data-action="edit" (click)="openModalEditTaskNote(taskNote)"></span>
data-type="user-tool" data-action="edit"
(click)="openModalEditTaskNote(taskNote)"></span>
</div>
</div>
</ng-container>
@@ -104,10 +108,13 @@
<div class="d-flex justify-content-end mt-1">
<span *ngIf="task.taskNotes?.length !== 0" role="button" class="badge bg-secondary p-2 me-2"
(click)="showTaskNotes(task)">
<ng-container *ngIf="task.id && taskNotesVisibility.get(task.id)">{{ 'basic.hide-comments' | translate }}</ng-container>
<ng-container *ngIf="task.id && !taskNotesVisibility.get(task.id)">{{ 'basic.show-comments' | translate }}</ng-container>
<ng-container
*ngIf="task.id && taskNotesVisibility.get(task.id)">{{ 'basic.hide-comments' | translate }}</ng-container>
<ng-container
*ngIf="task.id && !taskNotesVisibility.get(task.id)">{{ 'basic.show-comments' | translate }}</ng-container>
</span>
<span role="button" class="badge bg-secondary p-2" (click)="openModalNewTaskNote(task)">{{'basic.comment-it' | translate}}</span>
<span role="button" class="badge bg-secondary p-2"
(click)="openModalNewTaskNote(task)">{{ 'basic.comment-it' | translate }}</span>
</div>
</div>
<mat-paginator *ngIf="tasks.length > 0" class="rounded-1"
@@ -122,73 +129,73 @@
</app-toggle>
</div>

<!-- <div class="container spt-container">-->
<!-- <div class="d-flex justify-content-between align-items-start">-->
<!-- <h2>{{'user.my' | translate}} {{'basic.customer' | translate}}</h2>-->
<!-- </div>-->
<!-- <table mat-table [dataSource]="dataSource" matSort (matSortChange)="onSortChange($event)"-->
<!-- class="mat-elevation-z8 mb-3">-->
<!-- <div class="container spt-container">-->
<!-- <div class="d-flex justify-content-between align-items-start">-->
<!-- <h2>{{'user.my' | translate}} {{'basic.customer' | translate}}</h2>-->
<!-- </div>-->
<!-- <table mat-table [dataSource]="dataSource" matSort (matSortChange)="onSortChange($event)"-->
<!-- class="mat-elevation-z8 mb-3">-->

<!-- <ng-container matColumnDef="pos">-->
<!-- <th mat-header-cell *matHeaderCellDef>-->
<!-- {{ 'overview.number' | translate }}-->
<!-- </th>-->
<!-- <td mat-cell-->
<!-- *matCellDef="let element">{{ (pageSize * pageIndex) + dataSource.filteredData.indexOf(element) + 1 }}-->
<!-- </td>-->
<!-- </ng-container>-->
<!-- <ng-container matColumnDef="pos">-->
<!-- <th mat-header-cell *matHeaderCellDef>-->
<!-- {{ 'overview.number' | translate }}-->
<!-- </th>-->
<!-- <td mat-cell-->
<!-- *matCellDef="let element">{{ (pageSize * pageIndex) + dataSource.filteredData.indexOf(element) + 1 }}-->
<!-- </td>-->
<!-- </ng-container>-->

<!-- <ng-container matColumnDef="image">-->
<!-- <th mat-header-cell *matHeaderCellDef>-->
<!-- {{ 'overview.logo' | translate }}-->
<!-- </th>-->
<!-- <td mat-cell *matCellDef="let element">-->
<!-- <img role="button" src="{{ element.logoUrl }}" (click)="navigateToPartnerDetails(element)" width="40"-->
<!-- height="40"/>-->
<!-- </td>-->
<!-- </ng-container>-->
<!-- <ng-container matColumnDef="image">-->
<!-- <th mat-header-cell *matHeaderCellDef>-->
<!-- {{ 'overview.logo' | translate }}-->
<!-- </th>-->
<!-- <td mat-cell *matCellDef="let element">-->
<!-- <img role="button" src="{{ element.logoUrl }}" (click)="navigateToPartnerDetails(element)" width="40"-->
<!-- height="40"/>-->
<!-- </td>-->
<!-- </ng-container>-->

<!-- <ng-container matColumnDef="name">-->
<!-- <th mat-header-cell *matHeaderCellDef mat-sort-header-->
<!-- sortActionDescription="{{ 'overview.sort' | translate }}: {{ partnerNameOne }}">-->
<!-- {{ partnerNameOne }}-->
<!-- </th>-->
<!-- <td mat-cell *matCellDef="let element"><span role="button"-->
<!-- (click)="navigateToPartnerDetails(element)">{{ element.name }}</span>-->
<!-- </td>-->
<!-- </ng-container>-->
<!-- <ng-container matColumnDef="name">-->
<!-- <th mat-header-cell *matHeaderCellDef mat-sort-header-->
<!-- sortActionDescription="{{ 'overview.sort' | translate }}: {{ partnerNameOne }}">-->
<!-- {{ partnerNameOne }}-->
<!-- </th>-->
<!-- <td mat-cell *matCellDef="let element"><span role="button"-->
<!-- (click)="navigateToPartnerDetails(element)">{{ element.name }}</span>-->
<!-- </td>-->
<!-- </ng-container>-->

<!-- <ng-container matColumnDef="address">-->
<!-- <th mat-header-cell *matHeaderCellDef mat-sort-header="address"-->
<!-- sortActionDescription="{{ 'overview.sort' | translate }}: {{ 'overview.address' | translate }}">-->
<!-- {{ 'overview.address' | translate }}-->
<!-- </th>-->
<!-- <td mat-cell *matCellDef="let element">{{ element.street }} {{ element.streetNo }}-->
<!-- <br/>{{ element.zip }} {{ element.city }}-->
<!-- <br/>{{ element.country }}-->
<!-- </td>-->
<!-- </ng-container>-->
<!-- <ng-container matColumnDef="address">-->
<!-- <th mat-header-cell *matHeaderCellDef mat-sort-header="address"-->
<!-- sortActionDescription="{{ 'overview.sort' | translate }}: {{ 'overview.address' | translate }}">-->
<!-- {{ 'overview.address' | translate }}-->
<!-- </th>-->
<!-- <td mat-cell *matCellDef="let element">{{ element.street }} {{ element.streetNo }}-->
<!-- <br/>{{ element.zip }} {{ element.city }}-->
<!-- <br/>{{ element.country }}-->
<!-- </td>-->
<!-- </ng-container>-->

<!-- <ng-container matColumnDef="website">-->
<!-- <th mat-header-cell *matHeaderCellDef mat-sort-header-->
<!-- sortActionDescription="{{ 'overview.sort' | translate }}: {{ 'overview.website' | translate }}">-->
<!-- {{ 'overview.website' | translate }}-->
<!-- </th>-->
<!-- <td mat-cell *matCellDef="let element"><a href="{{ element.website }}"-->
<!-- target="_blank">{{ element.website }}</a>-->
<!-- </td>-->
<!-- </ng-container>-->
<!-- <ng-container matColumnDef="website">-->
<!-- <th mat-header-cell *matHeaderCellDef mat-sort-header-->
<!-- sortActionDescription="{{ 'overview.sort' | translate }}: {{ 'overview.website' | translate }}">-->
<!-- {{ 'overview.website' | translate }}-->
<!-- </th>-->
<!-- <td mat-cell *matCellDef="let element"><a href="{{ element.website }}"-->
<!-- target="_blank">{{ element.website }}</a>-->
<!-- </td>-->
<!-- </ng-container>-->

<!-- <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>-->
<!-- <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>-->
<!-- </table>-->
<!-- <mat-paginator class="rounded-1"-->
<!-- [pageSizeOptions]="[10,25,50]"-->
<!-- [length]="length"-->
<!-- (page)="handlePageEvent($event)"-->
<!-- [pageSize]="pageSize"-->
<!-- [pageIndex]="pageIndex"-->
<!-- showFirstLastButtons>-->
<!-- </mat-paginator>-->
<!-- </div>-->
<!-- <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>-->
<!-- <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>-->
<!-- </table>-->
<!-- <mat-paginator class="rounded-1"-->
<!-- [pageSizeOptions]="[10,25,50]"-->
<!-- [length]="length"-->
<!-- (page)="handlePageEvent($event)"-->
<!-- [pageSize]="pageSize"-->
<!-- [pageIndex]="pageIndex"-->
<!-- showFirstLastButtons>-->
<!-- </mat-paginator>-->
<!-- </div>-->
</div>

+ 1
- 1
matsen-tool/src/app/partners/partners-detail/partners-detail.component.html Прегледај датотеку

@@ -93,7 +93,7 @@
<button class="btn btn-primary toggle-btn" (click)="openModalNewTask()">{{ 'basic.new-task' | translate }}</button>
<div class="tasks mb-3" *ngFor="let task of tasks">
<div class="card p-3">
<div class="position-relative" data-bs-toggle="collapse"
<div class="position-relative collapsed" data-bs-toggle="collapse"
[attr.data-bs-target]="'#collapse-' + ApiConverter.extractId(task.id)"
aria-expanded="false"
aria-controls="collapseExample">


+ 1
- 1
matsen-tool/src/app/tasks/tasks.component.html Прегледај датотеку

@@ -6,7 +6,7 @@
</div>
<div class="tasks mb-3" *ngFor="let task of tasks">
<div class="card p-3">
<div class="position-relative" data-bs-toggle="collapse" [attr.data-bs-target]="'#collapse-' + ApiConverter.extractId(task.id)"
<div class="position-relative collapsed" data-bs-toggle="collapse" [attr.data-bs-target]="'#collapse-' + ApiConverter.extractId(task.id)"
aria-expanded="false"
aria-controls="collapseExample">
<h3 class="m-0">{{task.partnerName}}</h3>


+ 45
- 0
matsen-tool/src/assets/scss/_basics.scss Прегледај датотеку

@@ -101,10 +101,12 @@ img {
transform: rotate(-45deg);
left: 20px;
}

&.collapsed {
&:before {
transform: rotate(-45deg);
}

&:after {
transform: rotate(45deg);
}
@@ -117,3 +119,46 @@ img {
top: -3.38rem;
}

.spt-toggle {
position: relative;
padding-left: 30px;
&:before,
&:after {
content: "";
position: absolute;
top: 42px;
width: 15px;
height: 2px;
background: #000;
@include transition();
}

&:before {
transform: rotate(45deg);
left: 0;
}

&:after {
transform: rotate(-45deg);
left: 10px;
}

&.collapsed {
&:before {
transform: rotate(-45deg);
}

&:after {
transform: rotate(45deg);
}
}
}

.tasks {
.collapse {
div {
padding-left: 30px;
}
}
}


Write Preview
Loading…
Откажи
Сачувај