Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
Frontend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Package Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
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
HUB Terra
SMS
Frontend
Commits
a02a69ea
Commit
a02a69ea
authored
3 years ago
by
Tobias Kuhnert
Browse files
Options
Downloads
Patches
Plain Diff
extracted text from device - new (basic data)
parent
5750a039
No related branches found
No related tags found
1 merge request
!154
Draft: Resolve "Text Usage"
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
components/DeviceBasicDataForm.vue
+14
-14
14 additions, 14 deletions
components/DeviceBasicDataForm.vue
config/language/locales/en.json
+18
-1
18 additions, 1 deletion
config/language/locales/en.json
pages/devices/new.vue
+4
-4
4 additions, 4 deletions
pages/devices/new.vue
with
36 additions
and
19 deletions
components/DeviceBasicDataForm.vue
+
14
−
14
View file @
a02a69ea
...
@@ -37,7 +37,7 @@ permissions and limitations under the Licence.
...
@@ -37,7 +37,7 @@ permissions and limitations under the Licence.
<v-col
cols=
"12"
md=
"6"
>
<v-col
cols=
"12"
md=
"6"
>
<v-text-field
<v-text-field
:value=
"deviceURN"
:value=
"deviceURN"
label=
"URN"
:
label=
"
$t('deviceComponents.basicData.
URN
')
"
readonly
readonly
disabled
disabled
/>
/>
...
@@ -47,7 +47,7 @@ permissions and limitations under the Licence.
...
@@ -47,7 +47,7 @@ permissions and limitations under the Licence.
:value=
"value.persistentIdentifier"
:value=
"value.persistentIdentifier"
:readonly=
"readonly"
:readonly=
"readonly"
:disabled=
"readonly"
:disabled=
"readonly"
label=
"
P
ersistent
i
dentifier
(PID
)"
:
label=
"
$t('deviceComponents.basicData.p
ersistent
I
dentifier
'
)"
@
input=
"update('persistentIdentifier', $event)"
@
input=
"update('persistentIdentifier', $event)"
/>
/>
</v-col>
</v-col>
...
@@ -58,7 +58,7 @@ permissions and limitations under the Licence.
...
@@ -58,7 +58,7 @@ permissions and limitations under the Licence.
:value=
"value.shortName"
:value=
"value.shortName"
:readonly=
"readonly"
:readonly=
"readonly"
:disabled=
"readonly"
:disabled=
"readonly"
label=
"
S
hort
n
ame"
:
label=
"
$t('deviceComponents.basicData.s
hort
N
ame
')
"
required
required
class=
"required"
class=
"required"
:rules=
"[rules.required]"
:rules=
"[rules.required]"
...
@@ -70,7 +70,7 @@ permissions and limitations under the Licence.
...
@@ -70,7 +70,7 @@ permissions and limitations under the Licence.
:value=
"value.longName"
:value=
"value.longName"
:readonly=
"readonly"
:readonly=
"readonly"
:disabled=
"readonly"
:disabled=
"readonly"
label=
"
L
ong
n
ame"
:
label=
"
$t('deviceComponents.basicData.l
ong
N
ame
')
"
@
input=
"update('longName', $event)"
@
input=
"update('longName', $event)"
/>
/>
</v-col>
</v-col>
...
@@ -82,7 +82,7 @@ permissions and limitations under the Licence.
...
@@ -82,7 +82,7 @@ permissions and limitations under the Licence.
:items=
"statusNames"
:items=
"statusNames"
:readonly=
"readonly"
:readonly=
"readonly"
:disabled=
"readonly"
:disabled=
"readonly"
label=
"Status"
:
label=
"
$t('deviceComponents.basicData.
Status
')
"
@
input=
"update('statusName', $event)"
@
input=
"update('statusName', $event)"
/>
/>
</v-col>
</v-col>
...
@@ -92,7 +92,7 @@ permissions and limitations under the Licence.
...
@@ -92,7 +92,7 @@ permissions and limitations under the Licence.
:items=
"deviceTypeNames"
:items=
"deviceTypeNames"
:readonly=
"readonly"
:readonly=
"readonly"
:disabled=
"readonly"
:disabled=
"readonly"
label=
"
D
evice
t
ype"
:
label=
"
$t('deviceComponents.basicData.d
evice
T
ype
')
"
@
input=
"update('deviceTypeName', $event)"
@
input=
"update('deviceTypeName', $event)"
/>
/>
</v-col>
</v-col>
...
@@ -102,7 +102,7 @@ permissions and limitations under the Licence.
...
@@ -102,7 +102,7 @@ permissions and limitations under the Licence.
:items=
"manufacturerNames"
:items=
"manufacturerNames"
:readonly=
"readonly"
:readonly=
"readonly"
:disabled=
"readonly"
:disabled=
"readonly"
label=
"Manufacturer"
:
label=
"
$t('deviceComponents.basicData.
Manufacturer
')
"
@
input=
"update('manufacturerName', $event)"
@
input=
"update('manufacturerName', $event)"
/>
/>
</v-col>
</v-col>
...
@@ -111,7 +111,7 @@ permissions and limitations under the Licence.
...
@@ -111,7 +111,7 @@ permissions and limitations under the Licence.
:value=
"value.model"
:value=
"value.model"
:readonly=
"readonly"
:readonly=
"readonly"
:disabled=
"readonly"
:disabled=
"readonly"
label=
"Model"
:
label=
"
$t('deviceComponents.basicData.
Model
')
"
@
input=
"update('model', $event)"
@
input=
"update('model', $event)"
/>
/>
</v-col>
</v-col>
...
@@ -123,7 +123,7 @@ permissions and limitations under the Licence.
...
@@ -123,7 +123,7 @@ permissions and limitations under the Licence.
:value=
"value.description"
:value=
"value.description"
:readonly=
"readonly"
:readonly=
"readonly"
:disabled=
"readonly"
:disabled=
"readonly"
label=
"Description"
:
label=
"
$t('
Description
')
"
rows=
"3"
rows=
"3"
@
input=
"update('description', $event)"
@
input=
"update('description', $event)"
/>
/>
...
@@ -135,7 +135,7 @@ permissions and limitations under the Licence.
...
@@ -135,7 +135,7 @@ permissions and limitations under the Licence.
:value=
"value.website"
:value=
"value.website"
:readonly=
"readonly"
:readonly=
"readonly"
:disabled=
"readonly"
:disabled=
"readonly"
label=
"Website"
:
label=
"
$t('deviceComponents.basicData.
Website
')
"
placeholder=
"https://"
placeholder=
"https://"
type=
"url"
type=
"url"
@
input=
"update('website', $event)"
@
input=
"update('website', $event)"
...
@@ -159,7 +159,7 @@ permissions and limitations under the Licence.
...
@@ -159,7 +159,7 @@ permissions and limitations under the Licence.
:value=
"value.serialNumber"
:value=
"value.serialNumber"
:readonly=
"readonly"
:readonly=
"readonly"
:disabled=
"readonly"
:disabled=
"readonly"
label=
"
S
erial
n
umber"
:
label=
"
$t('s
erial
N
umber
')
"
@
input=
"update('serialNumber', $event)"
@
input=
"update('serialNumber', $event)"
/>
/>
</v-col>
</v-col>
...
@@ -168,7 +168,7 @@ permissions and limitations under the Licence.
...
@@ -168,7 +168,7 @@ permissions and limitations under the Licence.
:value=
"value.inventoryNumber"
:value=
"value.inventoryNumber"
:readonly=
"readonly"
:readonly=
"readonly"
:disabled=
"readonly"
:disabled=
"readonly"
label=
"
I
nventory
n
umber"
:
label=
"
$t('i
nventory
N
umber
')
"
@
input=
"update('inventoryNumber', $event)"
@
input=
"update('inventoryNumber', $event)"
/>
/>
</v-col>
</v-col>
...
@@ -179,8 +179,8 @@ permissions and limitations under the Licence.
...
@@ -179,8 +179,8 @@ permissions and limitations under the Licence.
:input-value=
"value.dualUse"
:input-value=
"value.dualUse"
:readonly=
"readonly"
:readonly=
"readonly"
:disabled=
"readonly"
:disabled=
"readonly"
label=
"
Dual use
"
:
label=
"
$t('deviceComponents.basicData.dualUse')
"
hint=
"
can be used for
military
aims
"
:
hint=
"
$t('deviceComponents.basicData.
military
Hint')
"
:persistent-hint=
"true"
:persistent-hint=
"true"
color=
"red darken-3"
color=
"red darken-3"
@
change=
"update('dualUse', $event)"
@
change=
"update('dualUse', $event)"
...
...
This diff is collapsed.
Click to expand it.
config/language/locales/en.json
+
18
−
1
View file @
a02a69ea
...
@@ -18,6 +18,8 @@
...
@@ -18,6 +18,8 @@
"Search"
:
"Search"
,
"Search"
:
"Search"
,
"Extended Search"
:
"Extended Search"
,
"Extended Search"
:
"Extended Search"
,
"Clear"
:
"Clear"
,
"Clear"
:
"Clear"
,
"cancel"
:
"cancel"
,
"create"
:
"create"
,
"Name"
:
"Name"
,
"Name"
:
"Name"
,
"placeholderDeviceName"
:
"Name of device"
,
"placeholderDeviceName"
:
"Name of device"
,
"placeholderDeviceExtendedSearchSelectManufacturer"
:
"Select a manufacturer"
,
"placeholderDeviceExtendedSearchSelectManufacturer"
:
"Select a manufacturer"
,
...
@@ -40,5 +42,20 @@
...
@@ -40,5 +42,20 @@
"inventoryNumber"
:
"Inventory number"
,
"inventoryNumber"
:
"Inventory number"
,
"Description"
:
"Description"
,
"Description"
:
"Description"
,
"deleteEntity"
:
"Delete {entity}"
,
"deleteEntity"
:
"Delete {entity}"
,
"deleteConfirmationDialog"
:
"Do you really want to delete the {entity}"
"deleteConfirmationDialog"
:
"Do you really want to delete the {entity}"
,
"deviceComponents"
:
{
"basicData"
:
{
"URN"
:
"URN"
,
"persistentIdentifier"
:
"Persistent identifier (PID)"
,
"shortName"
:
"Short name"
,
"longName"
:
"Long name"
,
"Status"
:
"Status"
,
"deviceType"
:
"Device type"
,
"Manufacturer"
:
"Manufacturer"
,
"Model"
:
"Model"
,
"Website"
:
"Website"
,
"dualUse"
:
"Dual use"
,
"militaryHint"
:
"can be used for military aims"
}
}
}
}
This diff is collapsed.
Click to expand it.
pages/devices/new.vue
+
4
−
4
View file @
a02a69ea
...
@@ -46,7 +46,7 @@ permissions and limitations under the Licence.
...
@@ -46,7 +46,7 @@ permissions and limitations under the Licence.
nuxt
nuxt
to=
"/devices"
to=
"/devices"
>
>
cancel
{{
$t
(
'
cancel
'
)
}}
</v-btn>
</v-btn>
<v-btn
<v-btn
v-if=
"$auth.loggedIn"
v-if=
"$auth.loggedIn"
...
@@ -54,7 +54,7 @@ permissions and limitations under the Licence.
...
@@ -54,7 +54,7 @@ permissions and limitations under the Licence.
small
small
@
click=
"onSaveButtonClicked"
@
click=
"onSaveButtonClicked"
>
>
create
{{
$t
(
'
create
'
)
}}
</v-btn>
</v-btn>
</v-card-actions>
</v-card-actions>
<DeviceBasicDataForm
<DeviceBasicDataForm
...
@@ -70,7 +70,7 @@ permissions and limitations under the Licence.
...
@@ -70,7 +70,7 @@ permissions and limitations under the Licence.
nuxt
nuxt
to=
"/devices"
to=
"/devices"
>
>
cancel
{{
$t
(
'
cancel
'
)
}}
</v-btn>
</v-btn>
<v-btn
<v-btn
v-if=
"$auth.loggedIn"
v-if=
"$auth.loggedIn"
...
@@ -78,7 +78,7 @@ permissions and limitations under the Licence.
...
@@ -78,7 +78,7 @@ permissions and limitations under the Licence.
small
small
@
click=
"onSaveButtonClicked"
@
click=
"onSaveButtonClicked"
>
>
create
{{
$t
(
'
create
'
)
}}
</v-btn>
</v-btn>
</v-card-actions>
</v-card-actions>
</v-card>
</v-card>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment