pushed v0.8.37-beta

This commit is contained in:
Frede Hundewadt 2022-06-26 09:44:05 +02:00
parent 87ad678904
commit dc3323ba23
16 changed files with 117 additions and 109 deletions

View file

@ -19,7 +19,7 @@
{
<table class="table">
<thead>
<tr class="bg-dark text-white">
<tr class="bg-black opacity-75 text-white">
<th scope="col">Besøg</th>
<th scope="col">Demo</th>
<th scope="col">Salg</th>

View file

@ -21,9 +21,9 @@
@if (Companies.Any())
{
<div class="list-group list-group-flush">
<div class="list-group-item px-3 bg-dark text-white">
<div class="list-group-item px-3 bg-black text-white opacity-75">
<div class="row">
<div class="col-sm-1">
<div class="col-sm-1 col-md-1">
Besøg
</div>
<div class="col">
@ -39,15 +39,15 @@
Bynavn
</div>
<div class="col">
</div>
</div>
</div>
</div>
@foreach (var company in Companies)
{
<a class="list-group-item list-group-item-action" href="/companies/@company.CompanyId">
<a class=" list-group-item list-group-item-action" href="/companies/@company.CompanyId">
<div class="row align-items-center">
<div class="col-sm-1">
<div class="col-sm-1 col-md-1">
<DisplayStateComponent StateClass="@(company.HasFolded == 1 ? "the-dead" : Utils.GetVisitState(company.NextVisit))">
</DisplayStateComponent>
</div>
@ -68,7 +68,8 @@
ActionLink="/companies/$ID$/activity/new"
ButtonText="Besøg"
ButtonType="primary"
Enabled="@company.ValidVat"></ActivityButton>
Enabled="@company.ValidVat">
</ActivityButton>
</div>
</div>
</a>

View file

@ -22,7 +22,7 @@
<div class="card-header">
<div class="row">
<div class="col">
<h3>Kalender</h3>
<h2 class="workDate">@(DateTime.Parse(_workDate).ToLongDateString())</h2>
</div>
<div class="col">
<WorkDateComponent OnChanged="GetCalender"></WorkDateComponent>

View file

@ -19,7 +19,7 @@
{
<table class="table table-hover table-striped justify-content-center">
<thead>
<tr class="bg-dark text-white">
<tr class="bg-black text-white opacity-75">
<th scope="col">Navn</th>
<th scope="col">Fork</th>
<th scope="col" class="text-nowrap">Varenr</th>

View file

@ -1,16 +1,16 @@
@if (Inventory.Any())
{
<div class="list-group list-group-flush">
<div class="list-group-item px-2 bg-dark text-white rounded-2">
<div class="list-group-item px-3 bg-black text-white rounded-2 opacity-75">
<div class="row">
<div class="col">
<h4>Produkt</h4>
<div class="col fw-bold">
Produkt
</div>
<div class="col">
<h4>Varenr.</h4>
<div class="col fw-bold">
Varenr.
</div>
<div class="col">
<h4>Antal</h4>
<div class="col fw-bold">
Antal
</div>
</div>
</div>

View file

@ -1,8 +1,8 @@
@if (ProductHistory.Any())
{
<table class="table">
<table class="table table-striped">
<thead>
<tr class="bg-dark text-white rounded-2">
<tr class="bg-black text-white rounded-2 opacity-75">
<th scope="col">
Dato
</th>

View file

@ -17,7 +17,7 @@
<table class="table table-striped">
<thead>
<tr class="bg-dark text-white">
<tr class="bg-dark text-white opacity-75">
<th></th>
<th class="text-center" colspan="2" scope="col">Dagens Demo @(Report.NewDemoCount + Report.RecallDemoCount)</th>
<th class="text-center border-end" colspan="2" scope="col">Dagens Resultat</th>
@ -84,7 +84,7 @@
</table>
<table class="table">
<thead>
<tr class="bg-dark text-white">
<tr class="bg-dark text-white opacity-75">
<th scope="col">
Km Aften
</th>
@ -120,7 +120,7 @@
{
<table class="table">
<thead>
<tr class="bg-dark text-white">
<tr class="bg-black text-white opacity-75">
<th class="w-50" scope="col">Tekst</th>
<th class="w-50" scope="col">Medkørende Supervisor</th>
</tr>

View file

@ -1,7 +1,7 @@
@if (ReportList != null)
{
<div class="list-group list-group-flush">
<div class="list-group-item px-3 bg-dark text-white">
<div class="list-group-item px-3 bg-black text-white opacity-75">
<div class="row">
<div class="fw-bold col">
Dato

View file

@ -18,21 +18,44 @@
@if (TaskItemList.Any())
{
<div class="list-group list-group-flush">
@foreach (var task in TaskItemList)
{
<div class="list-group-item bg-black opacity-75 text-white">
<div class="row align-content-center">
<div class="col">
</div>
<div class="col">
</div>
<div class="col">
</div>
<div class="col">
</div>
</div>
</div>
@foreach (var task in TaskItemList)
{
<a class="list-group-item list-group-item-action" href="/task-items/@task.TaskItemId">
<div class="row align-items-center">
<div class="col">
@task.Name
</div>
<div class="col">
@task.DueTimestamp
</div>
<div class="col">
@(task.Text[..50]) ...
</div>
<div class="col">
<button class="btn btn-primary" @onclick="() => CallConfirmationModal(task.TaskItemId)">Afslut</button>
</div>
<div class="col">
<button class="btn btn-danger" @onclick="() => CloseTaskItem(task.TaskItemId)">Slet</button>
</div>
</div>
</a>
}
}
</div>
}
}

View file

@ -14,7 +14,10 @@
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
using System.Runtime.InteropServices;
using Microsoft.AspNetCore.Components;
using Wonky.Client.HttpInterceptors;
using Wonky.Client.HttpRepository;
using Wonky.Client.Shared;
using Wonky.Entity.DTO;
@ -25,7 +28,10 @@ namespace Wonky.Client.Components
[Parameter] public List<TaskItemDto> TaskItemList { get; set; } = new();
[Parameter] public EventCallback<string> OnDelete { get; set; }
[Parameter] public EventCallback<string> OnSelect { get; set; }
[Parameter] public EventCallback<string> OnDone { get; set; }
[Inject] private HttpInterceptorService _interceptor { get; set; }
[Inject] private ITaskItemHttpRepository _taskRepo { get; set; }
private Confirmation _confirmation = new ();
private string _taskItemId = "";
@ -35,6 +41,10 @@ namespace Wonky.Client.Components
_confirmation.Show();
}
private async Task CloseTaskItem(string taskItemId)
{
await OnDone.InvokeAsync(_taskItemId);
}
private async Task DeleteTaskItem()
{
_confirmation.Hide();

View file

@ -1,19 +0,0 @@
@*
// Copyright (C) 2022 FCS Frede's Computer Services.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
*@
@page "/ActivityList"
<h3>ActivityList</h3>

View file

@ -1,14 +0,0 @@
using Microsoft.AspNetCore.Components;
using Toolbelt.Blazor;
using Wonky.Client.HttpRepository;
using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
public partial class ActivityList
{
[Inject] private IActivityHttpRepository _activityRepo { get; set; }
[Inject] private IHttpClientInterceptor _interceptor { get; set; }
}

View file

@ -21,30 +21,32 @@
@attribute [Authorize(Roles = "Adviser")]
<div class="container">
<div class="row mb-3">
<div class="col-md-3">
<CompanySearchColumnComponent OnChanged="SetSearchCol"/>
<div class="sticky-top bg-dark bg-opacity-50 rounded-2 px-3">
<div class="container-fluid pt-3">
<div class="row mb-2">
<div class="col-md-3">
<CompanySearchColumnComponent OnChanged="SetSearchCol"/>
</div>
<div class="col-md-3">
<SearchPhraseComponent SavedSearch="@_savedSearch" OnChanged="SetSearchPhrase"/>
</div>
<div class="col-md-3">
<CompanySortComponent OnChanged="SetSortCol"/>
</div>
<div class="col-md-3">
<PageSizeComponent OnChanged="SetPageSize"></PageSizeComponent>
</div>
</div>
<div class="col-md-3">
<SearchPhraseComponent SavedSearch="@_savedSearch" OnChanged="SetSearchPhrase"/>
<div class="row mb-2">
<div class="col-md-6">
<PaginationComponent MetaData="_metaData" Spread="2" SelectedPage="SelectedPage"></PaginationComponent>
</div>
<div class="col-md-3">
</div>
<div class="col-md-3">
<a class="btn btn-success" href="/companies/new">Opret kunde</a>
</div>
</div>
<div class="col-md-3">
<CompanySortComponent OnChanged="SetSortCol"/>
</div>
<div class="col-md-3">
<PageSizeComponent OnChanged="SetPageSize"></PageSizeComponent>
</div>
</div>
</div>
<div class="row mb-3">
<div class="col-md-6">
<PaginationComponent MetaData="_metaData" Spread="2" SelectedPage="SelectedPage"></PaginationComponent>
</div>
<div class="col-md-3">
</div>
<div class="col-md-3">
<a class="btn btn-success" href="/companies/new">Opret kunde</a>
</div>
</div>

View file

@ -21,30 +21,31 @@
@attribute [Authorize(Roles = "Adviser,Admin")]
<div class="row mb-3">
<div class="col">
<ItemGroupComponent OnChanged="SetItemGroup"/>
</div>
<div class="col">
<ItemSearchComponent OnChanged="SetSearchCol"/>
</div>
<div class="col">
<SearchPhraseComponent OnChanged="SetSearchPhrase"/>
</div>
<div class="col">
<ItemSortComponent OnChanged="SetSortCol"/>
</div>
<div class="col-md-2">
<PageSizeComponent OnChanged="SetPageSize"></PageSizeComponent>
<div class="sticky-top bg-dark bg-opacity-50 rounded-2 px-3">
<div class="container-fluid pt-3">
<div class="row mb-3">
<div class="col">
<ItemGroupComponent OnChanged="SetItemGroup"/>
</div>
<div class="col">
<ItemSearchComponent OnChanged="SetSearchCol"/>
</div>
<div class="col">
<SearchPhraseComponent OnChanged="SetSearchPhrase"/>
</div>
<div class="col">
<ItemSortComponent OnChanged="SetSortCol"/>
</div>
<div class="col-md-2">
<PageSizeComponent OnChanged="SetPageSize"></PageSizeComponent>
</div>
</div>
<div class="row mb-3">
<div class="col">
<PaginationComponent MetaData="_metaDate" Spread="2" SelectedPage="SelectedPage"></PaginationComponent>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col">
<PaginationComponent MetaData="_metaDate" Spread="2" SelectedPage="SelectedPage"></PaginationComponent>
</div>
</div>
<div class="row">
<div class="col">
<ItemTableComponent SalesItems="_items"></ItemTableComponent>
</div>
</div>
<ItemTableComponent SalesItems="_items"></ItemTableComponent>

View file

@ -20,7 +20,7 @@ namespace Wonky.Client.Shared;
public partial class Confirmation
{
private string _modalDisplay = "";
private bool _showBackdrop = false;
private bool _showBackdrop;
[Parameter] public string BodyMessage { get; set; } = "";
[Parameter] public EventCallback OnOkClicked { get; set; }

View file

@ -1,4 +1,7 @@
@import url('open-iconic/font/css/open-iconic-bootstrap.min.css');
body {
font-size: 16px;
}
.draft-expires-msg {
font-size: 0.8em;
@ -7,6 +10,7 @@
height: 48px;
}
.workDate {
font-size: 1.25em;
font-variant: small-caps;
}
/* visit / vat state classes */