mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-25 16:44:28 +00:00
Merge branch 'feature-61164/AbgabetoolQualityGates'
This commit is contained in:
@@ -729,6 +729,7 @@ export const AbgabeMitarbeiterDetail = {
|
|||||||
v-model="newTermin.bezeichnung"
|
v-model="newTermin.bezeichnung"
|
||||||
:options="getAllowedAbgabeTypeOptions"
|
:options="getAllowedAbgabeTypeOptions"
|
||||||
:optionLabel="getOptionLabelAbgabetyp"
|
:optionLabel="getOptionLabelAbgabetyp"
|
||||||
|
:optionDisabled="getOptionDisabled"
|
||||||
scrollHeight="300px">
|
scrollHeight="300px">
|
||||||
</Dropdown>
|
</Dropdown>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -966,7 +966,10 @@ export const AbgabetoolAssistenz = {
|
|||||||
// this.loadProjektarbeiten()
|
// this.loadProjektarbeiten()
|
||||||
|
|
||||||
this.calcMaxTableHeight()
|
this.calcMaxTableHeight()
|
||||||
}
|
},
|
||||||
|
getOptionDisabled(option) {
|
||||||
|
return !option.aktiv
|
||||||
|
},
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
emailItems() {
|
emailItems() {
|
||||||
@@ -1176,7 +1179,8 @@ export const AbgabetoolAssistenz = {
|
|||||||
:style="{'width': '100%'}"
|
:style="{'width': '100%'}"
|
||||||
v-model="serienTermin.bezeichnung"
|
v-model="serienTermin.bezeichnung"
|
||||||
:options="abgabeTypeOptions"
|
:options="abgabeTypeOptions"
|
||||||
:optionLabel="getOptionLabelAbgabetyp">
|
:optionLabel="getOptionLabelAbgabetyp"
|
||||||
|
:optionDisabled="getOptionDisabled">
|
||||||
</Dropdown>
|
</Dropdown>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -304,7 +304,7 @@ export const AbgabetoolMitarbeiter = {
|
|||||||
pa.isCurrent = res.data[1]
|
pa.isCurrent = res.data[1]
|
||||||
|
|
||||||
let paIsBenotet = false
|
let paIsBenotet = false
|
||||||
if(pa.note !== undefined && pa !== null) {
|
if(pa.note !== undefined && pa.note !== null) {
|
||||||
// check if the note is not defined as a non final projektarbeit note
|
// check if the note is not defined as a non final projektarbeit note
|
||||||
const opt = this.notenOptionsNonFinal.find(opt => opt.note)
|
const opt = this.notenOptionsNonFinal.find(opt => opt.note)
|
||||||
// if thats the case allow further work
|
// if thats the case allow further work
|
||||||
|
|||||||
Reference in New Issue
Block a user