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