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.

Sign up for GitHub

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

Aufbaudaten edit #97

Merged
merged 4 commits into from
Jan 12, 2022
Merged

Aufbaudaten edit #97

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7228d6a
testweise Anzeige der Deckschicht
Jul 30, 2021
a5fb34a
Updates
Jul 30, 2021
94bddee
QGIS-Server hinzugefügt
Nov 23, 2021
36c714e
Dokumentation Ablauf beim Einfügen eines neuen Schildes
Jan 12, 2022
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
testweise Anzeige der Deckschicht
  • Loading branch information
Florian Timm authored and Florian Timm committed Jul 30, 2021
commit 7228d6a20fc6014306ddf4e748dec033d0a5d5e3
25 changes: 14 additions & 11 deletions src/ts/HTML.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,21 +78,21 @@ export class HTML {
return option;
}

static createTextInput(form: HTMLFormElement | HTMLDivElement, beschriftung: string, id: string, inhalt?: string) {
return HTML.createInputField("text", form, beschriftung, id, inhalt);
static createTextInput(form: HTMLFormElement | HTMLDivElement, beschriftung: string, id: string, inhalt?: string, breiteCSS?: string) {
return HTML.createInputField("text", form, beschriftung, id, inhalt, breiteCSS);
}

static createCheckboxTextInput(form: HTMLFormElement | HTMLDivElement, beschriftung: string, id: string, inhalt?: string) {
return HTML.createInputField("text", form, beschriftung, id, inhalt, true);
static createCheckboxTextInput(form: HTMLFormElement | HTMLDivElement, beschriftung: string, id: string, inhalt?: string, breiteCSS?: string) {
return HTML.createInputField("text", form, beschriftung, id, inhalt, breiteCSS, true);
}

static createNumberInput(form: HTMLFormElement | HTMLDivElement, beschriftung: string, id: string, inhalt?: string) {
let input = HTML.createInputField("number", form, beschriftung, id, inhalt);
static createNumberInput(form: HTMLFormElement | HTMLDivElement, beschriftung: string, id: string, inhalt?: string, breiteCSS?: string) {
let input = HTML.createInputField("number", form, beschriftung, id, inhalt, breiteCSS);
return input;
}

static createDateInput(form: HTMLFormElement | HTMLDivElement, beschriftung: string, id: string, inhalt?: string) {
let aufstellField = HTML.createInputField("text", form, beschriftung, id, inhalt);
static createDateInput(form: HTMLFormElement | HTMLDivElement, beschriftung: string, id: string, inhalt?: string, breiteCSS?: string) {
let aufstellField = HTML.createInputField("text", form, beschriftung, id, inhalt, breiteCSS);

aufstellField.autocomplete = "off";
$.datepicker.regional['de'] = {
Expand Down Expand Up @@ -123,10 +123,13 @@ export class HTML {
}


private static createInputField(type: "number" | "text" | "button", form: HTMLFormElement | HTMLDivElement, beschriftung: string, id: string, inhalt: string, checkbox: true): { checkbox: HTMLInputElement, input: HTMLInputElement }
private static createInputField(type: "number" | "text" | "button", form: HTMLFormElement | HTMLDivElement, beschriftung: string, id: string, inhalt?: string): HTMLInputElement
private static createInputField(type: "number" | "text" | "button", form: HTMLFormElement | HTMLDivElement, beschriftung: string, id: string, inhalt?: string, checkbox?: boolean): HTMLInputElement | { checkbox: HTMLInputElement, input: HTMLInputElement } {
private static createInputField(type: "number" | "text" | "button", form: HTMLFormElement | HTMLDivElement, beschriftung: string, id: string, inhalt: string, breiteCSS: string, checkbox: true): { checkbox: HTMLInputElement, input: HTMLInputElement }
private static createInputField(type: "number" | "text" | "button", form: HTMLFormElement | HTMLDivElement, beschriftung: string, id: string, inhalt?: string, breiteCSS?: string): HTMLInputElement
private static createInputField(type: "number" | "text" | "button", form: HTMLFormElement | HTMLDivElement, beschriftung: string, id: string, inhalt?: string, breiteCSS?: string, checkbox?: boolean): HTMLInputElement | { checkbox: HTMLInputElement, input: HTMLInputElement } {
let formGroup = HTML.createFormGroup(form, 'group_' + id);
if (breiteCSS) {
formGroup.style.width = breiteCSS;
}
let label = HTML.createLabel(beschriftung, id, formGroup, 'label_' + id);
label.className = "label_" + type;
HTML.createBreak(formGroup);
Expand Down
2 changes: 1 addition & 1 deletion src/ts/Objekte/Klartext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ export class Klartext {
let arten = Klartext.getAllSorted(klartext);
for (let a of arten) {
let isSelected = (value && value.getXlink() == a.getXlink());
HTML.createSelectNode(selectInput, a.getKt() + ' - ' + a.getBeschreib(), a.getXlink(), isSelected);
HTML.createSelectNode(selectInput, a.getKt().match('[^~]+$')[0] + ' - ' + a.getBeschreib(), a.getXlink(), isSelected);
}
if (value == null && platzhalter != undefined)
selectInput.value = null;
Expand Down
37 changes: 31 additions & 6 deletions src/ts/Objekte/Querschnittsdaten.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,22 @@ export class Querschnitt extends PrimaerObjekt implements InfoToolEditable {
if (querschnitt && querschnitt.getStation().hasAufbau()) {
div.innerHTML = "Aufbaudaten vorhanden";
div.style.color = "red";
querschnitt.getStation().getAufbauDaten()
//.then(() => { return Klartext.load('Itschiartneu') })
.then(() => { return querschnitt.getDeckschicht() })
.then((aufbau) => {
//div.innerHTML += '<br />' + aufbau.getArtNeu().getBeschreib()
let aufbauArt = Klartext.createKlartextSelectForm('Itschiartneu', div, 'Art', '', aufbau.getArtNeu())
$(aufbauArt.select).prop('disabled', true).trigger("chosen:updated");
let aufbauMat1 = Klartext.createKlartextSelectForm('Itschimat1', div, 'Material 1', '', aufbau.getMaterial1())
$(aufbauMat1.select).prop('disabled', true).trigger("chosen:updated");
let aufbauMat2 = Klartext.createKlartextSelectForm('Itschimat2', div, 'Material 2', '', aufbau.getMaterial2())
$(aufbauMat2.select).prop('disabled', true).trigger("chosen:updated");
let aufbauMat3 = Klartext.createKlartextSelectForm('Itschimat3', div, 'Material 3', '', aufbau.getMaterial3())
$(aufbauMat3.select).prop('disabled', true).trigger("chosen:updated");
})
.catch(() => { div.innerHTML += '<br />...aber wohl nicht hier' });

} else if (querschnitt) {
div.innerHTML = "(Vllt.) keine Aufbaudaten";
div.style.color = "green";
Expand All @@ -166,33 +182,33 @@ export class Querschnitt extends PrimaerObjekt implements InfoToolEditable {
$(lage.select).prop('disabled', !changeable).trigger("chosen:updated");

// Breite
let breite = HTML.createNumberInput(form, "Von Breite", "breite", querschnitt != undefined ? querschnitt.breite.toString() : undefined);
let breite = HTML.createNumberInput(form, "Von Breite", "breite", querschnitt != undefined ? querschnitt.breite.toString() : undefined, '95px');
breite.step = '1';
breite.max = '5000';
breite.min = '0'
breite.disabled = !changeable;

// BisBreite
let bisbreite = HTML.createNumberInput(form, "Bis Breite", "bisbreite", querschnitt != undefined ? querschnitt.bisBreite.toString() : undefined);
let bisbreite = HTML.createNumberInput(form, "Bis Breite", "bisbreite", querschnitt != undefined ? querschnitt.bisBreite.toString() : undefined, '95px');
bisbreite.step = '1';
bisbreite.max = '5000';
bisbreite.min = '0'
bisbreite.disabled = !changeable;

// VNK
let vnk = HTML.createTextInput(form, "VNK", "vnk", querschnitt != undefined ? querschnitt.getAbschnitt().getVnk() : undefined);
let vnk = HTML.createTextInput(form, "VNK", "vnk", querschnitt != undefined ? querschnitt.getAbschnitt().getVnk() : undefined, '95px');
vnk.disabled = true;

// NNK
let nnk = HTML.createTextInput(form, "NNK", "nnk", querschnitt != undefined ? querschnitt.getAbschnitt().getNnk() : undefined);
let nnk = HTML.createTextInput(form, "NNK", "nnk", querschnitt != undefined ? querschnitt.getAbschnitt().getNnk() : undefined, '95px');
nnk.disabled = true;

// Station
let station = HTML.createTextInput(form, "Station", "station", querschnitt != undefined ? querschnitt.vst + ' - ' + querschnitt.bst : undefined);
let station = HTML.createTextInput(form, "Station", "station", querschnitt != undefined ? querschnitt.vst + ' - ' + querschnitt.bst : undefined, '95px');
station.disabled = true;

// Streifen
let streifen = HTML.createTextInput(form, "Streifen", "streifen", querschnitt != undefined ? querschnitt.streifen + ' ' + querschnitt.streifennr : undefined);
let streifen = HTML.createTextInput(form, "Streifen", "streifen", querschnitt != undefined ? querschnitt.streifen + ' ' + querschnitt.streifennr : undefined, '95px');
streifen.disabled = true;

return Promise.all([art.promise, lage.promise])
Expand Down Expand Up @@ -792,6 +808,15 @@ export class Querschnitt extends PrimaerObjekt implements InfoToolEditable {
return this.hasSekObj;
}

public async getDeckschicht(): Promise<Aufbau> {
await this.station.getAufbauDaten();
for (let a of this._aufbaudaten) {
if (a.isDeckschicht())
return a;
}
return Promise.reject();
}


//Setter
public setStation(station: QuerStation) {
Expand Down