Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Maka
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Onboarding
AlekSIS-App-Maka
Compare revisions
main to 14-feedback
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
AlekSIS/onboarding/AlekSIS-App-Maka
Select target project
No results found
14-feedback
Select Git revision
Swap
Target
AlekSIS/onboarding/AlekSIS-App-Maka
Select target project
AlekSIS/onboarding/AlekSIS-App-Maka
1 result
main
Select Git revision
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (2)
Remove unused wrapper
· a0638de1
Julian
authored
5 months ago
a0638de1
Use CreateEffort component
· 7d66272e
Julian
authored
5 months ago
7d66272e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
aleksis/apps/maka/frontend/components/efforts/Efforts.vue
+95
-89
95 additions, 89 deletions
aleksis/apps/maka/frontend/components/efforts/Efforts.vue
with
95 additions
and
89 deletions
aleksis/apps/maka/frontend/components/efforts/Efforts.vue
View file @
7d66272e
...
...
@@ -6,104 +6,107 @@ import SecondaryActionButton from "aleksis.core/components/generic/buttons/Secon
</
script
>
<
template
>
<shared-secret-wrapper>
<v-container>
<inline-c-r-u-d-list
:headers=
"headers"
:i18n-key=
"i18nKey"
create-item-i18n-key=
"maka.efforts.create"
:gql-query=
"gqlQuery"
:gql-create-mutation=
"gqlCreateMutation"
:gql-patch-mutation=
"gqlPatchMutation"
:gql-delete-mutation=
"gqlDeleteMutation"
:default-item=
"defaultItem"
>
<!-- eslint-disable-next-line vue/valid-v-slot -->
<template
#name.field
="
{ attrs, on }">
<div
aria-required=
"true"
>
<v-text-field
v-bind=
"attrs"
v-on=
"on"
:rules=
"$rules().required.build()"
/>
</div>
</
template
>
<
template
#effortType=
"{ item }"
>
<effort-type-chip
:effort-type=
"item.effortType"
v-if=
"item.effortType"
<v-container>
<inline-c-r-u-d-list
:headers=
"headers"
:i18n-key=
"i18nKey"
create-item-i18n-key=
"maka.efforts.create"
:gql-query=
"gqlQuery"
:gql-create-mutation=
"gqlCreateMutation"
:gql-patch-mutation=
"gqlPatchMutation"
:gql-delete-mutation=
"gqlDeleteMutation"
:default-item=
"defaultItem"
>
<!-- eslint-disable-next-line vue/valid-v-slot -->
<template
#name.field
="
{ attrs, on }">
<div
aria-required=
"true"
>
<v-text-field
v-bind=
"attrs"
v-on=
"on"
:rules=
"$rules().required.build()"
/>
<span
v-else
>
–
</span>
</
template
>
<!-- eslint-disable-next-line vue/valid-v-slot -->
<
template
#effortType.field=
"{ attrs, on }"
>
<div
aria-required=
"true"
>
<v-autocomplete
v-bind=
"attrs"
v-on=
"on"
:items=
"effortTypes"
item-text=
"name"
item-value=
"id"
:rules=
"$rules().required.build()"
/>
</div>
</
template
>
</div>
</
template
>
<
template
#group=
"{ item }"
>
<group-chip
:group=
"item.group"
/>
</
template
>
<!-- eslint-disable-next-line vue/valid-v-slot -->
<
template
#group.field=
"{ attrs, on }"
>
<div
aria-required=
"true"
>
<v-autocomplete
v-bind=
"attrs"
v-on=
"on"
:items=
"groups"
item-text=
"name"
item-value=
"id"
:rules=
"$rules().required.build()"
/>
</div>
</
template
>
<
template
#effortType=
"{ item }"
>
<effort-type-chip
:effort-type=
"item.effortType"
v-if=
"item.effortType"
/>
<span
v-else
>
–
</span>
</
template
>
<!-- eslint-disable-next-line vue/valid-v-slot -->
<
template
#effortType.field=
"{ attrs, on }"
>
<div
aria-required=
"true"
>
<v-autocomplete
v-bind=
"attrs"
v-on=
"on"
:items=
"effortTypes"
item-text=
"name"
item-value=
"id"
:rules=
"$rules().required.build()"
/>
</div>
</
template
>
<
template
#gr
adeSet
=
"{ item }"
>
{{
item
.
gradeSet
.
name
}}
</
template
>
<!-- eslint-disable-next-line vue/valid-v-slot -->
<
template
#gr
adeSet
.field=
"{ attrs, on }"
>
<div
aria-required=
"true"
>
<v-autocomplete
v-bind=
"attrs"
v-on=
"on"
:items=
"gr
adeSet
s"
item-text=
"name"
item-value=
"id"
:rules=
"$rules().required.build()"
/>
</div>
</
template
>
<
template
#gr
oup
=
"{ item }"
>
<group-chip
:group=
"item.group"
/>
</
template
>
<!-- eslint-disable-next-line vue/valid-v-slot -->
<
template
#gr
oup
.field=
"{ attrs, on }"
>
<div
aria-required=
"true"
>
<v-autocomplete
v-bind=
"attrs"
v-on=
"on"
:items=
"gr
oup
s"
item-text=
"name"
item-value=
"id"
:rules=
"$rules().required.build()"
/>
</div>
</
template
>
<
template
#actions=
"{ item }"
>
<secondary-action-button
i18n-key=
"actions.open_grade_book"
icon-text=
"mdi-open-in-new"
:to=
"
{
name: 'core.groupWithTab',
params: {
id: item.group.id,
tabSlug: slug,
},
}"
<
template
#gradeSet=
"{ item }"
>
{{
item
.
gradeSet
.
name
}}
</
template
>
<!-- eslint-disable-next-line vue/valid-v-slot -->
<
template
#gradeSet.field=
"{ attrs, on }"
>
<div
aria-required=
"true"
>
<v-autocomplete
v-bind=
"attrs"
v-on=
"on"
:items=
"gradeSets"
item-text=
"name"
item-value=
"id"
:rules=
"$rules().required.build()"
/>
</
template
>
</inline-c-r-u-d-list>
</v-container>
</shared-secret-wrapper>
</div>
</
template
>
<
template
#actions=
"{ item }"
>
<secondary-action-button
i18n-key=
"actions.open_grade_book"
icon-text=
"mdi-open-in-new"
:to=
"
{
name: 'core.groupWithTab',
params: {
id: item.group.id,
tabSlug: slug,
},
}"
/>
</
template
>
<
template
#createComponent=
"{ attrs, on }"
>
<CreateEffort
style=
"width: fit-content"
v-bind=
"attrs"
v-on=
"on"
/>
</
template
>
</inline-c-r-u-d-list>
</v-container>
</template>
<
script
>
import
formRulesMixin
from
"
aleksis.core/mixins/formRulesMixin.js
"
;
import
CreateEffort
from
"
./CreateEffort.vue
"
;
import
{
helperGroups
,
helperGradeSets
,
...
...
@@ -120,6 +123,9 @@ import { GRADE_BOOK_TAB_SLUG } from "../../index";
export
default
{
name
:
"
Efforts
"
,
mixins
:
[
formRulesMixin
],
components
:
{
CreateEffort
,
},
apollo
:
{
groups
:
{
query
:
helperGroups
,
...
...
This diff is collapsed.
Click to expand it.