Update Test Gitlab-Wechsel

This commit is contained in:
2021-08-26 12:13:19 +02:00
parent 1746401541
commit f0289af9fe
2435 changed files with 6019 additions and 1780924 deletions

View File

@@ -1,4 +1,5 @@
@page "/Company/Berufsangebot"
@page "/Company/Berufsangebot/{paramfid:int}"
@inject Blazored.SessionStorage.ISessionStorageService sessionStorage
@inherits Admin.ListBase;
@using System.ComponentModel.DataAnnotations
@@ -23,8 +24,10 @@ line-height: 1.0;
position: relative;
}*@
</style>
<h3><b>Berufsangebot</b></h3>
<p></p>
<div class="card">
<h6 class="card-header card-header3">Berufsangebot</h6>
<div class="card-body">
<div class="control-section e-tab-section">
<div class="card">
<div class="card-body" style="background-color:#cfe4df;">
@@ -79,7 +82,7 @@ position: relative;
<h5>Anzahl verfügbare Plätze</h5>
<SfDropDownList @bind-Value=@PlatzID TValue="string" TItem="Plaetze" Placeholder="Max. Anzahl Plätze" DataSource="@plaetze">
<DropDownListFieldSettings Value="id" Text="text"></DropDownListFieldSettings>
</SfDropDownList>
</SfDropDownList><p></p>
<h5>Mind. Anforderung</h5>
<SfDropDownList @bind-Value=@KlassenTypID TValue="string" TItem="Klassentyp" Placeholder="Klassentyp" DataSource="@klassentyp">
<DropDownListFieldSettings Value="ID" Text="bezeichnung"></DropDownListFieldSettings>
@@ -192,6 +195,9 @@ position: relative;
</div>
</div>
</div>
</div>
<SfTextBox Value="@fid"></SfTextBox>
<SfDialog Width="250px" IsModal="true" @bind-Visible="@ShowDialogCompany">
@@ -236,6 +242,9 @@ position: relative;
</style>
@code {
[Parameter]
public int paramfid { get; set; }
SfToast ToastObj;
private string ToastPosition = "Right";
private string ToastContent = "Daten erfolgreich gespeichert";
@@ -296,7 +305,15 @@ position: relative;
zeiten.Add(ze);
}
userid = await sessionStorage.GetItemAsync<string>("UserID");
Firmendaten = BlazorApp.Controller.FirmaController.GetByUserID(userid);
if (paramfid != 0)
{
Firmendaten = BlazorApp.Controller.FirmaController.GetByID(paramfid);
await sessionStorage.SetItemAsync("FirmaID", paramfid.ToString());
}
else
{
Firmendaten = BlazorApp.Controller.FirmaController.GetByUserID(userid);
}
_firma = Firmendaten.First<BWPMModels.Firma>();
if (_firma.nameZ1 == "")
{
@@ -335,7 +352,7 @@ position: relative;
{
AP a1 = new AP();
a1.ID = item.ID;
a1.name = item.name;
a1.name = item.name+" "+item.vorname;
lap.Add(a1);
}

View File

@@ -1,4 +1,5 @@
@page "/Company/Company"
@page "/Company/Company/{paramfid:int}"
@inject Blazored.SessionStorage.ISessionStorageService sessionStorage
@inherits Admin.ListBase;
@using System.ComponentModel.DataAnnotations
@@ -11,195 +12,193 @@
@using BlazorApp.Helper
@using BWPMModels;
@*<div class="container">*@
<div class="card">
<h6 class="card-header card-header1">Firmen-Daten</h6>
<div class="card-body">
<h3><b>Firmen-Daten</b></h3>
<p></p>
<div class="card">
<div class="card-body">
<div class="control-section e-tab-section">
<div class="control-section e-tab-section">
<EditForm Model="_firma" OnValidSubmit="@Submit" OnInvalidSubmit="@InvalidSubmit">
<DataAnnotationsValidator />
<SfTab ID="BlazorTab" >
<TabItems>
<TabItem>
<ChildContent>
<TabHeader Text="Kontakt-Daten"></TabHeader>
</ChildContent>
<ContentTemplate>
<div class="row">
<div class="col-md-6">
<div class="card">
<div class="row">
<div class="col-md-6">
<div class="card">
<h6 class="card-header card-header1">Kontakt-Daten</h6>
<div class="card-body">
<div class="card-body">
<h5 class="card-title">Adress-Daten</h5>
<form>
<div class="form-group row">
<label for="nameZ1" class="col-2 col-form-label">Name</label>
<div class="col-10">
<InputText id="namez1" class="form-control" @bind-Value="_firma.nameZ1" placeholder="Firmenname" />
<ValidationMessage For="@(() => _firma.nameZ1)" />
</div>
</div>
<div class="form-group row">
<label for="nameZ2" class="col-2 col-form-label">Zusatz</label>
<div class="col-10">
<InputText id="nameZ2" class="form-control" @bind-Value="@_firma.nameZ2" placeholder="Zusatz" />
<ValidationMessage For="@(() => _firma.nameZ2)" />
</div>
</div>
<div class="form-group row">
<label for="strasse" class="col-2 col-form-label">Strasse</label>
<div class="col-10">
<InputText id="strasse" class="form-control" @bind-Value="@_firma.strasse" placeholder="Strasse" />
<ValidationMessage For="@(() => _firma.strasse)" />
</div>
</div>
<div class="form-group row">
<label for="plz" class="col-2 col-form-label">PLZ</label>
<div class="col-10">
<InputText id="plz" class="form-control" @bind-Value="@_firma.plz" placeholder="Postleitzahl" />
<ValidationMessage For="@(() => _firma.plz)" />
</div>
</div>
<div class="form-group row">
<label for="ort" class="col-2 col-form-label">Ort</label>
<div class="col-10">
<InputText id="ort" class="form-control" @bind-Value="@_firma.ort" placeholder="Ort" />
<ValidationMessage For="@(() => _firma.ort)" />
</div>
</div>
<hr />
<div class="form-group row">
<label for="telefon" class="col-2 col-form-label">Telefon</label>
<div class="col-10">
<InputText id="tel" class="form-control" @bind-Value="@_firma.tel" placeholder="Telefon-Nummer" />
<ValidationMessage For="@(() => _firma.tel)" />
</div>
</div>
<div class="form-group row">
<label for="email" class="col-2 col-form-label">E-Mail</label>
<div class="col-10">
<InputText id="mail" class="form-control" @bind-Value="@_firma.mail" placeholder="E-Mail" required="required" typeof="email" />
<ValidationMessage For="@(() => _firma.mail)" />
</div>
</div>
<div class="form-group row">
<label for="web" class="col-2 col-form-label">Internet</label>
<div class="col-10">
<InputText id="internet" class="form-control" @bind-Value="@_firma.web" placeholder="Internet" />
<ValidationMessage For="@(() => _firma.web)" />
</div>
</div>
<div class="form-group row">
<label for="Bemerkungen" class="col-2 col-form-label">Bemerkung</label>
<div class="col-10">
<InputTextArea id="bemerkung" class="form-control" @bind-Value="@_firma.bemerkung" placeholder="Bemerkung" />
<ValidationMessage For="@(() => _firma.bemerkung)" />
</div>
</div>
</form>
</div>
</div>
<div class="form-group row">
<label for="nameZ1" class="col-2 col-form-label">Name</label>
<div class="col-10">
<InputText id="namez1" class="form-control" @bind-Value="_firma.nameZ1" placeholder="Firmenname" />
<ValidationMessage For="@(() => _firma.nameZ1)" />
</div>
<div class="col-md-6">
<div class="card">
<div class="card-body">
<h5 class="card-title">Ansprechperson</h5>
<form>
<div class="form-group row">
<label for="Anrede" class="col-2 col-form-label">Anrede</label>
<div class="col-10">
<select id="Anrede" name="Anrede" class="form-control" @bind="@_firma.anrede">
<option value="1">Herr</option>
<option value="2">Frau</option>
<option value="3">Damen und Herren</option>
</select>
</div>
</div>
<div class="form-group row">
<label for="ansprechperson_anme" class="col-2 col-form-label">Name</label>
<div class="col-10">
<InputText id="ansprechperson_name" class="form-control" @bind-Value="@_firma.ansprechperson_name" placeholder="Name Ansprechperson" />
<ValidationMessage For="@(() => _firma.ansprechperson_name)" />
</div>
</div>
<div class="form-group row">
<label for="ansprechperson_vorname" class="col-2 col-form-label">Vorname</label>
<div class="col-10">
<InputText id="ansprechperson_vorname" class="form-control" @bind-Value="@_firma.ansprechperon_vorname" placeholder="Vorname Ansprechperson" />
<ValidationMessage For="@(() => _firma.ansprechperon_vorname)" />
</div>
</div>
<div class="form-group row">
<label for="briefanrede" class="col-2 col-form-label">Briefanrede</label>
<div class="col-10">
<InputText id="briefanrede" class="form-control" @bind-Value="@_firma.briefanrede" placeholder="gewünschte Briefanrede" />
<ValidationMessage For="@(() => _firma.briefanrede)" />
</div>
</div>
<div class="form-group row">
<label for="handy" class="col-2 col-form-label">Telefon</label>
<div class="col-10">
<InputText id="handy" class="form-control" @bind-Value="@_firma.handy" placeholder="Telefon" />
<ValidationMessage For="@(() => _firma.handy)" />
</div>
</div>
</div>
<div class="form-group row">
<label for="nameZ2" class="col-2 col-form-label">Zusatz</label>
<div class="col-10">
<InputText id="nameZ2" class="form-control" @bind-Value="@_firma.nameZ2" placeholder="Zusatz" />
<ValidationMessage For="@(() => _firma.nameZ2)" />
</div>
</div>
<div class="form-group row">
<label for="strasse" class="col-2 col-form-label">Strasse</label>
<div class="col-10">
<InputText id="strasse" class="form-control" @bind-Value="@_firma.strasse" placeholder="Strasse" />
<ValidationMessage For="@(() => _firma.strasse)" />
</div>
</div>
<div class="form-group row">
<label for="plz" class="col-2 col-form-label">PLZ</label>
<div class="col-10">
<InputText id="plz" class="form-control" @bind-Value="@_firma.plz" placeholder="Postleitzahl" />
<ValidationMessage For="@(() => _firma.plz)" />
</div>
</div>
<div class="form-group row">
<label for="ort" class="col-2 col-form-label">Ort</label>
<div class="col-10">
<InputText id="ort" class="form-control" @bind-Value="@_firma.ort" placeholder="Ort" />
<ValidationMessage For="@(() => _firma.ort)" />
</div>
</div>
<hr />
<div class="form-group row">
<label for="telefon" class="col-2 col-form-label">Telefon</label>
<div class="col-10">
<InputText id="tel" class="form-control" @bind-Value="@_firma.tel" placeholder="Telefon-Nummer" />
<ValidationMessage For="@(() => _firma.tel)" />
</div>
</div>
<div class="form-group row">
<label for="email" class="col-2 col-form-label">E-Mail</label>
<div class="col-10">
<InputText id="mail" class="form-control" @bind-Value="@_firma.mail" placeholder="E-Mail" required="required" typeof="email" />
<ValidationMessage For="@(() => _firma.mail)" />
</div>
</div>
<div class="form-group row">
<label for="web" class="col-2 col-form-label">Internet</label>
<div class="col-10">
<InputText id="internet" class="form-control" @bind-Value="@_firma.web" placeholder="Internet" />
<ValidationMessage For="@(() => _firma.web)" />
</form>
</div>
</div>
</div>
</div>
<div class="form-group row">
<label for="Bemerkungen" class="col-2 col-form-label">Bemerkung</label>
<div class="col-10">
<InputTextArea id="bemerkung" class="form-control" @bind-Value="@_firma.bemerkung" placeholder="Bemerkung" />
<ValidationMessage For="@(() => _firma.bemerkung)" />
</div>
</div>
</ContentTemplate>
</TabItem>
<TabItem>
<ChildContent>
<TabHeader text="Angaben zur Ausbildung"></TabHeader>
</ChildContent>
<ContentTemplate>
<div class="col-md">
<div class="card">
<div class="card-body">
<h5 class="card-title">Allgemeine Angaben</h5>
<form>
<div class="form-group row">
<label for="ausbildung_Standort" class="col-2 col-form-label">Ausbildungsstandort</label>
<div class="col-10">
<InputTextArea id="ausbildung_Standort" class="form-control" @bind-Value="@_firma.ausbildungsstandort" placeholder="Allgmeine Angaben über Ausbildungsstandort" />
<ValidationMessage For="@(() => _firma.ausbildungsstandort)" />
</div>
</div>
<div class="form-group row">
<label for="ausbildung_bemerkung" class="col-2 col-form-label">Bemerkung</label>
<div class="col-10">
<InputTextArea id="ausbildung_bemerkung" class="form-control" @bind-Value="@_firma.ausbildungsbemerkung" placeholder="Allgemeine Bemerkungen zu den Ausbildungen" />
<ValidationMessage For="@(() => _firma.ausbildungsbemerkung)" />
</div>
</div>
</form>
</div>
</div>
</div>
</div>
<div class=col-md-6>
<div class="card">
<h5 class="card-header card-header1">Ansprech-Person</h5>
<div class="card-body">
<div class="form-group row">
<label for="Anrede" class="col-2 col-form-label">Anrede</label>
<div class="col-10">
<select id="Anrede" name="Anrede" class="form-control" @bind="@_firma.anrede">
<option value="1">Herr</option>
<option value="2">Frau</option>
<option value="3">Damen und Herren</option>
</select>
</div>
</div>
</ContentTemplate>
</TabItem>
</TabItems>
</SfTab>
<div class="form-group row">
<label for="ansprechperson_anme" class="col-2 col-form-label">Name</label>
<div class="col-10">
<InputText id="ansprechperson_name" class="form-control" @bind-Value="@_firma.ansprechperson_name" placeholder="Name Ansprechperson" />
<ValidationMessage For="@(() => _firma.ansprechperson_name)" />
</div>
</div>
<div class="form-group row">
<label for="ansprechperson_vorname" class="col-2 col-form-label">Vorname</label>
<div class="col-10">
<InputText id="ansprechperson_vorname" class="form-control" @bind-Value="@_firma.ansprechperon_vorname" placeholder="Vorname Ansprechperson" />
<ValidationMessage For="@(() => _firma.ansprechperon_vorname)" />
</div>
</div>
<div class="form-group row">
<label for="briefanrede" class="col-2 col-form-label">Briefanrede</label>
<div class="col-10">
<InputText id="briefanrede" class="form-control" @bind-Value="@_firma.briefanrede" placeholder="gewünschte Briefanrede" />
<ValidationMessage For="@(() => _firma.briefanrede)" />
</div>
</div>
<div class="form-group row">
<label for="handy" class="col-2 col-form-label">Telefon</label>
<div class="col-10">
<InputText id="handy" class="form-control" @bind-Value="@_firma.handy" placeholder="Telefon" />
<ValidationMessage For="@(() => _firma.handy)" />
</div>
</div>
</div>
</div>
<p>
</p>
<div class="card">
<h5 class="card-header card-header1">Angaben zur Ausbildung</h5>
<div class="card-body">
<div class="form-group row">
<label for="ausbildung_Standort" class="col-2 col-form-label">Ausbildungsstandort</label>
<div class="col-10">
<InputTextArea id="ausbildung_Standort" class="form-control" @bind-Value="@_firma.ausbildungsstandort" placeholder="Allgmeine Angaben über Ausbildungsstandort" />
<ValidationMessage For="@(() => _firma.ausbildungsstandort)" />
</div>
</div>
<div class="form-group row">
<label for="ausbildung_bemerkung" class="col-2 col-form-label">Bemerkung</label>
<div class="col-10">
<InputTextArea id="ausbildung_bemerkung" class="form-control" @bind-Value="@_firma.ausbildungsbemerkung" placeholder="Allgemeine Bemerkungen zu den Ausbildungen" />
<ValidationMessage For="@(() => _firma.ausbildungsbemerkung)" />
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
@if (paramfid != 0)
{
<br>
<div class="card">
<div class="card-body">
<h5 class="card-title">Diverses</h5>
<SfCheckBox Label="Aktiv" @bind-Checked="@_firma.aktiv"></SfCheckBox><br />
<SfCheckBox Label="Aktuell" @bind-Checked="@_firma.aktuell"></SfCheckBox>
</div>
</div>
}
</div>
</div>
<div class="card">
<div class="card-body">
<SfButton IsPrimary="true" OnClick="@(() => SaveClick())">Speichern</SfButton>
</div>
</div>
<div class="card-body">
<SfButton IsPrimary="true" OnClick="@(() => SaveClick())">Speichern</SfButton>
</div>
</div>
</EditForm>
</div>
</div>
</div>
@@ -242,6 +241,8 @@
</style>
@code {
[Parameter]
public int paramfid { get; set; }
SfToast ToastObj;
private string ToastPosition = "Right";
@@ -258,6 +259,7 @@
public void Submit()
{
_firma.mutierer = userid;
BlazorApp.Controller.FirmaController.PUT(_firma);
ToastObj.ShowAsync();
}
@@ -273,41 +275,25 @@
private void SaveClick()
{
//BlazorApp.Controller.FirmaController.PUT(_firma);
}
protected override async void OnInitialized()
{
}
protected override async Task OnAfterRenderAsync(bool firstRender)
{
@*userid = "4c456017-85b9-4f34-a42c-f3ac534cc34f";*@
protected override async Task OnInitializedAsync()
{
userid = await sessionStorage.GetItemAsync<string>("UserID");
if (userid == null)
{
var authState = await authenticationStateTask;
var userId = authState.User.Claims.FirstOrDefault().Value;
var user = authState.User;
if (user.Identity.IsAuthenticated)
if (paramfid != 0)
{
await sessionStorage.SetItemAsync("UserID", userId);
userid = userId;
Firmendaten = BlazorApp.Controller.FirmaController.GetByID(paramfid);
}
else
{
await sessionStorage.SetItemAsync("UserID", userId);
userid = userId;
Firmendaten = BlazorApp.Controller.FirmaController.GetByUserID(userid);
}
}
if (firstRender)
{
Firmendaten = BlazorApp.Controller.FirmaController.GetByUserID(userid);
_firma = Firmendaten.First<BWPMModels.Firma>();
}
}
protected override async Task OnAfterRenderAsync(bool firstRender)
{
}

View File

@@ -12,8 +12,9 @@
@using BlazorApp.Controller;
<h3><b>Ansprechpartner</b></h3>
<div class="card">
<h6 class="card-header card-header2">Ansprechpartner</h6>
<div class="card-body">
<div class="col-lg-12 control-section">
<div class="content-wrapper">
@@ -51,6 +52,8 @@
</div>
</div>
</div>
</div></div>
<SfDialog Width="250px" IsModal="true" @bind-Visible="@ShowDialog">
<DialogTemplates>
@@ -141,7 +144,7 @@
@*userid = "4c456017-85b9-4f34-a42c-f3ac534cc34f";*@
userid = await sessionStorage.GetItemAsync<string>("UserID");
if (userid == null)
@* if (userid == null)
{
var authState = await authenticationStateTask;
var userId = authState.User.Claims.FirstOrDefault().Value;
@@ -158,7 +161,7 @@
await sessionStorage.SetItemAsync("UserID", userId);
userid = userId;
}
}
}*@
Firmendaten = BlazorApp.Controller.FirmaController.GetByUserID(userid);
_firma = Firmendaten.First<BWPMModels.Firma>();

View File

@@ -247,6 +247,7 @@
public int foundrow = 0;
SfGrid<View_Berufsangebot> Grid { get; set; }
SfGrid<BWPMModels.Ansprechpartner> GridAP { get; set; }
protected override async Task OnInitializedAsync()
{
var authState = await authenticationStateTask;
@@ -262,13 +263,13 @@
protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (firstRender != true) { return; };
@* if (firstRender != true) { return; };
var authState = await authenticationStateTask;
userid = authState.User.Claims.FirstOrDefault().Value;
await sessionStorage.SetItemAsync("UserID", userid);
Firmendaten = BlazorApp.Controller.FirmaController.GetByUserID(userid);
_firma = Firmendaten.First<BWPMModels.Firma>();
await sessionStorage.SetItemAsync("FirmaID", _firma.ID.ToString());
await sessionStorage.SetItemAsync("FirmaID", _firma.ID.ToString());*@
}