Commit 9766c6c3 authored by jackie / Andrea Ida Malkah Klaura's avatar jackie / Andrea Ida Malkah Klaura
Browse files

FEAT: add cancel button to conflict resolution mode

parent 63b0cb2f
......@@ -57,8 +57,8 @@
align="center"
>
<h4>Conflict Resolution</h4>
<p>for new schedule</p>
<p>
for new schedule
from <b>{{ resolveData.schedule.dstart }}, {{ resolveData.schedule.tstart }}</b>
to <b>{{ resolveData.schedule.tend }}</b>.
</p>
......@@ -67,7 +67,18 @@
until: <b>{{ resolveData.schedule.until }}</b>.
</p>
<p v-if="conflictCount > 0">
Conflicts to resolve: {{ conflictCount }}
Conflicts left to resolve:
<b-badge variant="danger">
{{ conflictCount }}
</b-badge>
&nbsp;
<b-button
variant="danger"
size="sm"
@click="resolveCancel"
>
Cancel
</b-button>
</p>
<p v-else>
<b-button
......@@ -76,6 +87,13 @@
>
0 conflicts left! Submit this solution.
</b-button>
&nbsp;
<b-button
variant="danger"
@click="resolveCancel"
>
Cancel
</b-button>
</p>
</div>
</b-alert>
......@@ -383,6 +401,11 @@ export default {
}
},
resolveCancel () {
this.conflictMode = false
this.renderView(null)
},
// submit a conflict-resolved schedule to steering
resolveSubmit () {
// TODO: check why steering retourns undefined and null values here
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment