Skip to content

Commit

Permalink
Merge pull request #980 from OpenC3/astro
Browse files Browse the repository at this point in the history
Further astro refinements
  • Loading branch information
jmthomas authored Dec 16, 2023
2 parents 6c264d2 + 5b1b5d2 commit 93cb3ea
Show file tree
Hide file tree
Showing 38 changed files with 147 additions and 89 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
dense
single-line
hide-details
style="max-width: 350px"
class="search"
/>
</v-card-title>
<v-data-table
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# GNU Affero General Public License for more details.

# Modified by OpenC3, Inc.
# All changes Copyright 2022, OpenC3, Inc.
# All changes Copyright 2023, OpenC3, Inc.
# All Rights Reserved
#
# This file may also be used under the terms of a commercial license
Expand All @@ -33,17 +33,17 @@
<v-container v-else>
<v-row no-gutters>
<v-col>
<v-overflow-btn
<v-select
:items="states"
v-model="value.selected_state"
@change="handleStateChange"
item-text="label"
item-value="value"
label="State"
style="primary"
:class="stateClass()"
hide-details
dense
outlined
data-test="cmd-param-select"
/>
</v-col>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# GNU Affero General Public License for more details.

# Modified by OpenC3, Inc.
# All changes Copyright 2022, OpenC3, Inc.
# All changes Copyright 2023, OpenC3, Inc.
# All Rights Reserved
#
# This file may also be used under the terms of a commercial license
Expand Down Expand Up @@ -49,7 +49,7 @@
dense
single-line
hide-details
style="max-width: 350px"
class="search"
/>
</v-card-title>
<v-data-table
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
dense
single-line
hide-details
style="max-width: 350px"
class="search"
/>
</v-card-title>
<v-data-table
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
dense
single-line
hide-details
style="max-width: 350px"
class="search"
/>
</v-card-title>
<v-data-table
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
dense
single-line
hide-details
style="max-width: 350px"
class="search"
/>
</v-card-title>
<v-data-table
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
dense
single-line
hide-details
style="max-width: 350px"
class="search"
/>
</v-card-title>
<v-data-table
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
dense
single-line
hide-details
style="max-width: 350px"
class="search"
/>
</v-card-title>
<v-data-table
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
dense
single-line
hide-details
style="max-width: 350px"
class="search"
/>
</v-card-title>
<v-data-table
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
dense
single-line
hide-details
style="max-width: 350px"
class="search"
/>
</v-card-title>
<v-data-table
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# GNU Affero General Public License for more details.

# Modified by OpenC3, Inc.
# All changes Copyright 2022, OpenC3, Inc.
# All changes Copyright 2023, OpenC3, Inc.
# All Rights Reserved
#
# This file may also be used under the terms of a commercial license
Expand All @@ -30,7 +30,9 @@
<v-select
class="ma-0 pa-0"
label="Select Target(s)"
dense
hide-details
outlined
:items="targetNames"
v-model="selectedTargetNames"
@change="targetSelect"
Expand Down Expand Up @@ -62,10 +64,11 @@
<v-col>
<v-select
label="Item Columns"
dense
hide-details
outlined
v-model="columns"
:items="columnItems"
dense
></v-select>
</v-col>
</v-row>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# GNU Affero General Public License for more details.

# Modified by OpenC3, Inc.
# All changes Copyright 2022, OpenC3, Inc.
# All changes Copyright 2023, OpenC3, Inc.
# All Rights Reserved
#
# This file may also be used under the terms of a commercial license
Expand All @@ -23,22 +23,24 @@
<template>
<div>
<v-card class="pa-5">
<v-row dense>
<v-row class="ma-1">
<v-text-field
dense
outlined
readonly
hide-details
label="Overall Limits State"
:prepend-inner-icon="astroIcon"
:value="overallStateFormatted"
:class="textFieldClass"
style="padding-right: 10px; max-width: 280px"
style="margin-right: 10px; max-width: 280px"
data-test="overall-state"
/>
<v-text-field
dense
outlined
readonly
hide-details
label="Current Limits Set"
:value="currentLimitsSet"
style="max-width: 200px"
Expand Down Expand Up @@ -476,6 +478,9 @@ export default {
position: absolute;
top: 50px;
}
.v-input {
background-color: var(--color-background-base-default);
}
/* TODO: Color the border */
.textfield-green :deep(.v-text-field__slot) input,
.textfield-green :deep(.v-text-field__slot) label {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# GNU Affero General Public License for more details.

# Modified by OpenC3, Inc.
# All changes Copyright 2022, OpenC3, Inc.
# All changes Copyright 2023, OpenC3, Inc.
# All Rights Reserved
#
# This file may also be used under the terms of a commercial license
Expand All @@ -34,7 +34,7 @@
dense
single-line
hide-details
style="max-width: 300px"
class="search"
/>
</v-card-title>
<v-data-table
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# GNU Affero General Public License for more details.

# Modified by OpenC3, Inc.
# All changes Copyright 2022, OpenC3, Inc.
# All changes Copyright 2023, OpenC3, Inc.
# All Rights Reserved
#
# This file may also be used under the terms of a commercial license
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# GNU Affero General Public License for more details.

# Modified by OpenC3, Inc.
# All changes Copyright 2022, OpenC3, Inc.
# All changes Copyright 2023, OpenC3, Inc.
# All Rights Reserved
#
# This file may also be used under the terms of a commercial license
Expand Down Expand Up @@ -43,7 +43,7 @@
dense
single-line
hide-details
style="max-width: 350px"
class="search"
/>
</v-card-title>
<v-data-table
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# GNU Affero General Public License for more details.

# Modified by OpenC3, Inc.
# All changes Copyright 2022, OpenC3, Inc.
# All changes Copyright 2023, OpenC3, Inc.
# All Rights Reserved
#
# This file may also be used under the terms of a commercial license
Expand All @@ -33,16 +33,15 @@
<v-spacer />
<v-text-field
v-model="runningSearch"
class="pt-0"
class="pt-0 search"
label="Search"
prepend-inner-icon="mdi-magnify"
clearable
outlined
dense
single-line
hide-details
data-test="running-search"
style="max-width: 350px" /></v-row
data-test="running-search" /></v-row
></v-card-title>
<v-data-table
:headers="runningHeaders"
Expand Down Expand Up @@ -89,15 +88,14 @@
<v-spacer />
<v-text-field
v-model="completedSearch"
class="pt-0"
class="pt-0 search"
label="Search"
prepend-inner-icon="mdi-magnify"
clearable
outlined
dense
single-line
hide-details
style="max-width: 350px"
/>
</v-row>
</v-card-title>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
dense
single-line
hide-details
style="max-width: 300px"
class="search"
data-test="search-messages"
/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2336,6 +2336,9 @@ hr {
width: 5%;
margin: auto;
}
.script-state {
background-color: var(--color-background-base-default);
}
.script-state :deep(input) {
text-transform: capitalize;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,10 @@
<v-col cols="5">
<v-select
label="Suite:"
class="ma-3"
class="mb-2 mr-2"
hide-details
dense
outlined
@change="suiteChanged"
:items="suites"
v-model="suite"
Expand Down Expand Up @@ -119,9 +120,10 @@
<v-col cols="5">
<v-select
label="Group:"
class="ma-3"
class="mb-2 mr-2"
hide-details
dense
outlined
@change="groupChanged"
:items="groups"
v-model="group"
Expand Down Expand Up @@ -194,9 +196,10 @@
<v-col cols="5">
<v-select
label="Script:"
class="ma-3"
class="mb-2 mr-2"
hide-details
dense
outlined
@change="scriptChanged"
:items="scripts"
v-model="script"
Expand Down
Loading

0 comments on commit 93cb3ea

Please sign in to comment.