-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
added accounting module, refactored commands and queries
- Loading branch information
Showing
86 changed files
with
650 additions
and
192 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 34 additions & 0 deletions
34
src/Client/Logistics.OfficeApp/src/app/pages/accounting/accounting.routes.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
import {Routes} from '@angular/router'; | ||
import {Permissions} from '@core/enums'; | ||
import {AuthGuard} from '@core/guards'; | ||
|
||
|
||
export const ACCOUNTING_ROUTES: Routes = [ | ||
// { | ||
// path: '', | ||
// component: ListLoadComponent, | ||
// canActivate: [AuthGuard], | ||
// data: { | ||
// breadcrumb: '', | ||
// permission: Permissions.Loads.View, | ||
// }, | ||
// }, | ||
// { | ||
// path: 'add', | ||
// component: AddLoadComponent, | ||
// canActivate: [AuthGuard], | ||
// data: { | ||
// breadcrumb: 'Add', | ||
// permission: Permissions.Loads.Create, | ||
// }, | ||
// }, | ||
// { | ||
// path: 'edit/:id', | ||
// component: EditLoadComponent, | ||
// canActivate: [AuthGuard], | ||
// data: { | ||
// breadcrumb: 'Edit', | ||
// permission: Permissions.Loads.Edit, | ||
// }, | ||
// }, | ||
]; |
Empty file.
1 change: 1 addition & 0 deletions
1
...t/Logistics.OfficeApp/src/app/pages/accounting/list-invoices/list-invoices.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
<p>invoices works!</p> |
Empty file.
15 changes: 15 additions & 0 deletions
15
...ent/Logistics.OfficeApp/src/app/pages/accounting/list-invoices/list-invoices.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
import {Component} from '@angular/core'; | ||
import {CommonModule} from '@angular/common'; | ||
|
||
@Component({ | ||
selector: 'app-list-invoices', | ||
standalone: true, | ||
templateUrl: './list-invoices.component.html', | ||
styleUrls: ['./list-invoices.component.scss'], | ||
imports: [ | ||
CommonModule, | ||
], | ||
}) | ||
export class ListInvoicesComponent { | ||
|
||
} |
111 changes: 111 additions & 0 deletions
111
...t/Logistics.OfficeApp/src/app/pages/accounting/list-payments/list-payments.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,111 @@ | ||
<div class="d-flex align-items-center"> | ||
<h1>List Loads</h1> | ||
<button pButton pRipple | ||
class="p-button-lg p-button-rounded p-button-text text-black ms-2" | ||
icon="bi bi-plus-square-fill" | ||
pTooltip="Add a new load" | ||
routerLink="/loads/add"> | ||
</button> | ||
</div> | ||
<hr class="w-100"> | ||
|
||
<p-card> | ||
<div class="row"> | ||
<div class="col-12"> | ||
<p-table [value]="loads" responsiveLayout="scroll" [lazy]="true" | ||
[paginator]="true" [showCurrentPageReport]="true" | ||
(onLazyLoad)="load($event)" [rows]="10" [(first)]="first" | ||
[totalRecords]="totalRecords" [loading]="isLoading" | ||
[rowsPerPageOptions]="[10,25,50]"> | ||
<ng-template pTemplate="caption"> | ||
<div class="d-flex"> | ||
<span class="p-input-icon-left"> | ||
<i class="pi pi-search"></i> | ||
<input pInputText type="text" placeholder="Search" (input)="search($event)" /> | ||
</span> | ||
</div> | ||
</ng-template> | ||
<ng-template pTemplate="header"> | ||
<tr> | ||
<th pSortableColumn="refId"> | ||
ID | ||
<p-sortIcon field="refId"></p-sortIcon> | ||
</th> | ||
<th pSortableColumn="name"> | ||
Name | ||
<p-sortIcon field="name"></p-sortIcon> | ||
</th> | ||
<th pSortableColumn="originAddress"> | ||
Origin | ||
<p-sortIcon field="originAddress"></p-sortIcon> | ||
</th> | ||
<th pSortableColumn="destinationAddress"> | ||
Destination | ||
<p-sortIcon field="destinationAddress"></p-sortIcon> | ||
</th> | ||
<th pSortableColumn="dispatchedDate"> | ||
Dispatched | ||
<p-sortIcon field="dispatchedDate"></p-sortIcon> | ||
</th> | ||
<th pSortableColumn="pickUpDate"> | ||
Pick Up | ||
<p-sortIcon field="pickUpDate"></p-sortIcon> | ||
</th> | ||
<th pSortableColumn="deliveryDate"> | ||
Delivery | ||
<p-sortIcon field="deliveryDate"></p-sortIcon> | ||
</th> | ||
<th pSortableColumn="status"> | ||
Status | ||
<p-sortIcon field="status"></p-sortIcon> | ||
</th> | ||
<th pSortableColumn="distance"> | ||
Distance (mi) | ||
<p-sortIcon field="distance"></p-sortIcon> | ||
</th> | ||
<th pSortableColumn="deliveryCost"> | ||
Cost | ||
<p-sortIcon field="deliveryCost"></p-sortIcon> | ||
</th> | ||
<th> | ||
Truck | ||
</th> | ||
<th> | ||
Dispatcher | ||
</th> | ||
</tr> | ||
</ng-template> | ||
<ng-template pTemplate="body" let-load> | ||
<tr> | ||
<td> | ||
<a [routerLink]="['/loads/edit', load.id]"> | ||
{{load.refId}} | ||
</a> | ||
</td> | ||
<td [pTooltip]="load.name" [showDelay]="500" tooltipPosition="bottom"> | ||
{{load.name}} | ||
</td> | ||
<td [pTooltip]="load.originAddress" [showDelay]="500" tooltipPosition="bottom"> | ||
{{load.originAddress}} | ||
</td> | ||
<td [pTooltip]="load.destinationAddress" [showDelay]="500" tooltipPosition="bottom"> | ||
{{load.destinationAddress}} | ||
</td> | ||
<td>{{load.dispatchedDate | date:'mediumDate'}}</td> | ||
<td>{{load.pickUpDate | date:'mediumDate'}}</td> | ||
<td>{{load.deliveryDate | date:'mediumDate'}}</td> | ||
<td>{{getLoadStatusName(load.status)}}</td> | ||
<td>{{load.distance | distanceUnit:'mi'}}</td> | ||
<td>{{load.deliveryCost | currency}}</td> | ||
<td> | ||
<a [routerLink]="['/truck/details', load.assignedTruckId]"> | ||
{{load.assignedTruckNumber}} | ||
</a> | ||
</td> | ||
<td>{{load.assignedDispatcherName}}</td> | ||
</tr> | ||
</ng-template> | ||
</p-table> | ||
</div> | ||
</div> | ||
</p-card> |
Empty file.
24 changes: 24 additions & 0 deletions
24
...ent/Logistics.OfficeApp/src/app/pages/accounting/list-payments/list-payments.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
import {Component} from '@angular/core'; | ||
import {CommonModule} from '@angular/common'; | ||
import {RouterModule} from '@angular/router'; | ||
import {CardModule} from 'primeng/card'; | ||
import {TableModule} from 'primeng/table'; | ||
import {TooltipModule} from 'primeng/tooltip'; | ||
|
||
|
||
@Component({ | ||
selector: 'app-list-payments', | ||
standalone: true, | ||
templateUrl: './list-payments.component.html', | ||
styleUrls: ['./list-payments.component.scss'], | ||
imports: [ | ||
CommonModule, | ||
CardModule, | ||
TableModule, | ||
TooltipModule, | ||
RouterModule, | ||
], | ||
}) | ||
export class ListPaymentsComponent { | ||
|
||
} |
1 change: 1 addition & 0 deletions
1
...ent/Logistics.OfficeApp/src/app/pages/accounting/list-payroll/list-payroll.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
<p>list-payroll works!</p> |
Empty file.
15 changes: 15 additions & 0 deletions
15
...lient/Logistics.OfficeApp/src/app/pages/accounting/list-payroll/list-payroll.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
import {Component} from '@angular/core'; | ||
import {CommonModule} from '@angular/common'; | ||
|
||
@Component({ | ||
selector: 'app-list-payroll', | ||
standalone: true, | ||
templateUrl: './list-payroll.component.html', | ||
styleUrls: ['./list-payroll.component.scss'], | ||
imports: [ | ||
CommonModule, | ||
], | ||
}) | ||
export class ListPayrollComponent { | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
src/Core/Logistics.Application.Admin/Commands/DeleteTenant/DeleteTenantCommand.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,10 @@ | ||
using Logistics.Application.Common; | ||
using Logistics.Shared; | ||
using MediatR; | ||
|
||
namespace Logistics.Application.Admin.Commands; | ||
|
||
public class DeleteTenantCommand : Request<ResponseResult> | ||
public class DeleteTenantCommand : IRequest<ResponseResult> | ||
{ | ||
public string? Id { get; set; } | ||
} |
3 changes: 2 additions & 1 deletion
3
...Core/Logistics.Application.Admin/Commands/RemoveRoleFromUser/RemoveRoleFromUserCommand.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
src/Core/Logistics.Application.Admin/Commands/UpdateTenant/UpdateTenantCommand.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
src/Core/Logistics.Application.Admin/Commands/UpdateUser/UpdateUserCommand.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 3 additions & 2 deletions
5
src/Core/Logistics.Application.Admin/Queries/GetAppRoles/GetAppRolesQuery.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,9 @@ | ||
using Logistics.Application.Common; | ||
using Logistics.Shared; | ||
using Logistics.Shared.Models; | ||
using MediatR; | ||
|
||
namespace Logistics.Application.Admin.Queries; | ||
|
||
public class GetAppRolesQuery : SearchableQuery<AppRoleDto> | ||
public class GetAppRolesQuery : SearchableQuery, IRequest<PagedResponseResult<AppRoleDto>> | ||
{ | ||
} |
3 changes: 2 additions & 1 deletion
3
src/Core/Logistics.Application.Admin/Queries/GetTenant/GetTenantQuery.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 3 additions & 2 deletions
5
src/Core/Logistics.Application.Admin/Queries/GetTenants/GetTenantsQuery.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.