diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 11895c35..28e1750d 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -97,12 +97,12 @@ js-linting: &js-linting default-steps: &default-steps - parallel: - - step: *e2e - - step: *e2e - - step: *python-tests - - step: *python-linting - - step: *js-tests - - step: *js-linting + - step: *e2e + - step: *e2e + - step: *python-tests + - step: *python-linting + - step: *js-tests + - step: *js-linting # main pipelines definitions pipelines: @@ -132,16 +132,16 @@ pipelines: script: - echo "Release ready!" - parallel: - - step: - <<: *deploy - name: deploy prod - deployment: prod - trigger: manual - - step: - <<: *deploy - name: deploy prod-azure - deployment: prod-azure - trigger: manual + - step: + <<: *deploy + name: deploy prod + deployment: prod + trigger: manual + - step: + <<: *deploy + name: deploy prod-azure + deployment: prod-azure + trigger: manual custom: deploy-feature-branch: - step: diff --git a/client/src/components/selfEvaluationFeedback/FeedbackByLearningUnitSummary.vue b/client/src/components/selfEvaluationFeedback/FeedbackByLearningUnitSummary.vue new file mode 100644 index 00000000..7939e216 --- /dev/null +++ b/client/src/components/selfEvaluationFeedback/FeedbackByLearningUnitSummary.vue @@ -0,0 +1,113 @@ + + + + + diff --git a/client/src/components/selfEvaluationFeedback/SmileyCell.vue b/client/src/components/selfEvaluationFeedback/SmileyCell.vue new file mode 100644 index 00000000..f6ca1601 --- /dev/null +++ b/client/src/components/selfEvaluationFeedback/SmileyCell.vue @@ -0,0 +1,24 @@ + + + + + diff --git a/client/src/components/ui/ItDropdownSelect.vue b/client/src/components/ui/ItDropdownSelect.vue index c8bf8462..8a9c3139 100644 --- a/client/src/components/ui/ItDropdownSelect.vue +++ b/client/src/components/ui/ItDropdownSelect.vue @@ -37,7 +37,7 @@ const dropdownSelected = computed({