Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add last updates to production #216

Merged
merged 13 commits into from
Jul 26, 2024
Merged

add last updates to production #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5fc1244
skylight env
britaumich Jul 25, 2024
952a4ea
Merge pull request #212 from lsa-mis/LRA-770-room-ready-config-skylight
britaumich Jul 25, 2024
2be0f88
change fields order
britaumich Jul 25, 2024
03d4a45
add placeholders
britaumich Jul 25, 2024
1cc7926
edit buttons
britaumich Jul 25, 2024
b5b4863
add more placeholders
britaumich Jul 25, 2024
bc9c1a9
Merge pull request #213 from lsa-mis/add-placeholders-to-fields
britaumich Jul 25, 2024
fe13d02
add margins around announcements
britaumich Jul 25, 2024
05d4cbc
checnge titles
britaumich Jul 26, 2024
4e4d6b0
edit dashboard
britaumich Jul 26, 2024
a08ec50
Merge pull request #214 from lsa-mis/working-on-tickets
britaumich Jul 26, 2024
9f03dcb
edit dashboard styles
britaumich Jul 26, 2024
eca9b74
Merge pull request #215 from lsa-mis/styles-for-dashboard
britaumich Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions app/assets/stylesheets/_custom_layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,12 @@ svg.wh6 {
white-space: nowrap;
}

@media (min-width: 1400px) {
.nowrap-card {
white-space: nowrap;
}
}

.nav-user {
font-size: 0.875rem;
width: 150px;
Expand Down
4 changes: 2 additions & 2 deletions app/views/app_preferences/_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@

<div class="mb-3">
<%= form.label :name, "Name *", class: "form-label" %>
<%= form.text_field :name, class: "form-control form-control-sm", required: true %>
<%= form.text_field :name, class: "form-control form-control-sm", required: true, placeholder: "Name" %>
</div>

<div class="mb-3">
<%= form.label :description, "Description *", class: "form-label" %>
<%= form.text_field :description, class: "form-control form-control-sm", required: true %>
<%= form.text_field :description, class: "form-control form-control-sm", required: true, placeholder: "Description" %>
</div>

<div class="mb-3">
Expand Down
11 changes: 5 additions & 6 deletions app/views/buildings/_floors.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
<table class="table text-center">
<thead class="table-group-divider">
<tr>
<th>Room Record Number</th>
<th>Number</th>
<th>Room Type</th>
<th>Room Record Number</th>
<td>View</td>
</tr>
</thead>
Expand All @@ -29,15 +29,14 @@
<% rooms.order(:room_number).each do |room| %>
<tr class="building_tbody_tr">
<td class="building_tbody_td">
<%#= link_to room.room_number, room_path(room), class: "link_to" %>
<%= room.rmrecnbr %>
<%= link_to room.room_number, room_path(room), data: { turbo_frame: "_top" }, class: "link_to" %>
</td>
<td class="building_tbody_td">
<%= link_to room.room_number, room_path(room), data: { turbo_frame: "_top" }, class: "link_to" %>
<%= room.room_type %>
</td>
<td class="building_tbody_td">
<%= room.room_type %>
</td>
<%= room.rmrecnbr %>
</td>
<td class="building_tbody_td">
<%= link_to room_path(room), class: "link_to", 'data-bs-toggle': "tooltip", 'data-bs-placement': "bottom", 'title': "View", data: { turbo_frame: "_top" } do %>
<i class="bi bi-eye-fill text-primary"></i>
Expand Down
2 changes: 1 addition & 1 deletion app/views/buildings/_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<% end %>
<div>
<%= form.label :bldrecnbr, 'Building Record Number', class: "nowrap" %>
<%= form.text_field :bldrecnbr, required: true %>
<%= form.text_field :bldrecnbr, required: true, placeholder: "Building Record Number" %>
</div>

<% if @zone.present? %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/buildings/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="d-flex justify-content-between">
<h1>Buildings</h1>
<div class="mb-auto mt-auto">
<%= link_to "Add Building", new_building_path, class: "btn btn-primary" %>
<%= link_to "Add New Building", new_building_path, class: "btn btn-primary" %>
</div>
</div>
<div>
Expand Down
4 changes: 2 additions & 2 deletions app/views/common_attribute_states/edit.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
</a>
<div class="d-none d-md-block" data-hideelement-target="hide_section">
<% if @common_form_announcement.content.present? %>
<div class="bg-accordion">
<p><%= @common_form_announcement.content %></p>
<div class="bg-accordion p-2 mb-3">
<%= @common_form_announcement.content %>
</div>
<% end %>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/views/common_attribute_states/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
</a>
<div class="d-none d-md-block" data-hideelement-target="hide_section">
<% if @common_form_announcement.content.present? %>
<div class="bg-accordion">
<p><%= @common_form_announcement.content %></p>
<div class="bg-accordion p-2 mb-3">
<%= @common_form_announcement.content %>
</div>
<% end %>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/views/common_attributes/_common_attributes_list.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<thead class="table-group-divider">
<tr>
<th scope="col" class="text-start">Description</th>
<th scope="col">Needs Checkbox?</th>
<th scope="col">Needs Quantity Box?</th>
<th scope="col">Include Yes/No Buttons</th>
<th scope="col">Include Quantity Box </th>
<th scope="col">Edit</th>
<th scope="col"><%= @option_header %></th>
</tr>
Expand Down
6 changes: 3 additions & 3 deletions app/views/common_attributes/_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@

<div class="mb-3">
<%= form.label :description, "Description *", class: "form-label" %>
<%= form.text_field :description, class: "form-control form-control-sm", required: true %>
<%= form.text_field :description, class: "form-control form-control-sm", required: true, placeholder: "Description" %>
</div>

<div class="form-check mb-3">
<%= form.check_box :need_checkbox, class: "form-check-input" %>
<%= form.label :need_checkbox, "Needs Checkbox?", class: "form-check-label" %>
<%= form.label :need_checkbox, "Include Yes/No Buttons", class: "form-check-label" %>
</div>

<div class="form-check mb-3">
<%= form.check_box :need_quantity_box, class: "form-check-input" %>
<%= form.label :need_quantity_box, "Needs Quantity Box?", class: "form-check-label" %>
<%= form.label :need_quantity_box, "Include Quantity Box", class: "form-check-label" %>
</div>

<div class="d-flex flex-row justify-content-start align-items-center gap-3">
Expand Down
4 changes: 2 additions & 2 deletions app/views/resource_states/edit.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
</a>
<div class="d-none d-md-block" data-hideelement-target="hide_section">
<% if @resource_form_announcement.content.present? %>
<div class="bg-accordion">
<p><%= @resource_form_announcement.content %></p>
<div class="bg-accordion p-2 mb-3">
<%= @resource_form_announcement.content %>
</div>
<% end %>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/views/resource_states/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
</a>
<div class="d-none d-md-block" data-hideelement-target="hide_section">
<% if @resource_form_announcement.content.present? %>
<div class="bg-accordion">
<p><%= @resource_form_announcement.content %></p>
<div class="bg-accordion p-2 mb-3">
<%= @resource_form_announcement.content %>
</div>
<% end %>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/views/rooms/_attributes_list.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<thead>
<tr>
<th scope="col" class="text-start">Description</th>
<th scope="col">Needs Checkbox?</th>
<th scope="col">Needs Quantity Box?</th>
<th scope="col">Include Yes/No Buttons</th>
<th scope="col">Include Quantity Box </th>
</tr>
</thead>
<tbody>
Expand Down
2 changes: 1 addition & 1 deletion app/views/rooms/_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<% end %>
<div>
<%= form.label :rmrecnbr, 'Room Record Number (Barcode) *', class: "nowrap" %>
<%= form.text_field :rmrecnbr, required: true %>
<%= form.text_field :rmrecnbr, required: true, placeholder: "Room Record Number" %>
</div>

<%= hidden_field_tag 'building_id', @building.id %>
Expand Down
10 changes: 5 additions & 5 deletions app/views/rooms/room_states/edit.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</ol>
</nav>
<h1>Edit Room Check for Room <%= @room.room_number %> </h1>
<h3>Location: <%= @room.floor.building.name %> (Floor <%= @room.floor.name %>) </h3>
<h2>Location: <%= @room.floor.building.name %> (Floor <%= @room.floor.name %>) </h2>

<div data-controller='hideelement'>
<a class="link_to mb-1 d-block d-md-none" data-hideelement-target="more_button" data-action="hideelement#showElement">
Expand All @@ -20,16 +20,16 @@
</a>
<div class="d-none d-md-block" data-hideelement-target="hide_section">
<% if @rovers_form_announcement.content.present? %>
<div class="bg-accordion">
<p><%= @rovers_form_announcement.content %></p>
<div class="bg-accordion p-2 mb-3">
<%= @rovers_form_announcement.content %>
</div>
<% end %>
</div>
</div>

<% if @notes.present? %>
<div class="bg-accordion">
<h4>Notes</h4>
<div>
<p class="bold-label">Room Notes</p>
<% @notes.each do |note| %>
<p>
<%= note.content %>
Expand Down
4 changes: 2 additions & 2 deletions app/views/rooms/room_states/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<%# Filter to get recent states %>
<div class="body-md-text">
<p>
Enter a Time Period to Filter Room States
Enter a Time Period to Filter Room Checks
</p>
</div>
<%= form_with url: room_room_states_path(@room), method: :get,
Expand All @@ -23,7 +23,7 @@
<%= form.label :to, "To: "%>
<%= form.date_field :to, value: params[:to], class: "form-control" %>
</div>
<%= form.submit "Filter Room States" %>
<%= form.submit "Filter Room Checks" %>
<a class="link_to" data-action="autosubmit#clearFilters">Clear Filters</a>
<%end%>
<br>
Expand Down
8 changes: 4 additions & 4 deletions app/views/rooms/room_states/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<h2>Location: <%= @room.floor.building.name %> (Floor <%= @room.floor.name %>) </h2>

<div data-controller='hideelement'>
<a class="link_to mb-1 d-block d-md-none" data-hideelement-target="more_button" data-action="hideelement#showElement">
<a class="link_to m-4 p-4 d-block d-md-none" data-hideelement-target="more_button" data-action="hideelement#showElement">
Show Announcement
<i class="bi bi-caret-up-fill"></i>
</a>
Expand All @@ -20,16 +20,16 @@
</a>
<div class="d-none d-md-block" data-hideelement-target="hide_section">
<% if @rovers_form_announcement.content.present? %>
<div class="bg-accordion">
<div class="bg-accordion p-2 mb-3">
<p><%= @rovers_form_announcement.content %></p>
</div>
<% end %>
</div>
</div>

<% if @notes.present? %>
<div class="bg-accordion">
<h3>Notes</h3>
<div>
<p class="bold-label">Room Notes</p>
<% @notes.each do |note| %>
<p>
<%= note.content %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/rooms/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<h1>Room: <%= @room.full_name %></h1>
<div class="d-flex align-items-end flex-column gap-1">
<%= link_to 'Back to Building', building_path(@room.floor.building), class: "link_to" %>
<%= link_to 'Show Room States', room_room_states_path(@room), class: 'btn btn-primary h-50 mt-auto mb-auto' %>
<%= link_to 'Show Room Checks', room_room_states_path(@room), class: 'btn btn-primary h-50 mt-auto mb-auto' %>
</div>
</div>

Expand Down
6 changes: 3 additions & 3 deletions app/views/rooms/specific_attributes/_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@

<div class="mb-3">
<%= form.label :description, "Description *", class: "form-label" %>
<%= form.text_field :description, class: "form-control form-control-sm", required: true %>
<%= form.text_field :description, class: "form-control form-control-sm", required: true, placeholder: "Description" %>
</div>

<% unless specific_attribute.specific_attribute_states.present? %>
<div class="form-check mb-3">
<%= form.check_box :need_checkbox, class: "form-check-input" %>
<%= form.label :need_checkbox, "Needs Checkbox?", class: "form-check-label" %>
<%= form.label :need_checkbox, "Include Yes/No Buttons", class: "form-check-label" %>
</div>

<div class="form-check mb-3">
<%= form.check_box :need_quantity_box, class: "form-check-input" %>
<%= form.label :need_quantity_box, "Needs Quantity Box?", class: "form-check-label" %>
<%= form.label :need_quantity_box, "Include Quantity Box ", class: "form-check-label" %>
</div>
<% end %>

Expand Down
4 changes: 2 additions & 2 deletions app/views/rooms/specific_attributes/_specific_attributes_list.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<thead class="table-group-divider">
<tr>
<th scope="col" class="text-start">Description</th>
<th scope="col">Needs Checkbox?</th>
<th scope="col">Needs Quantity Box?</th>
<th scope="col">Include Yes/No Buttons</th>
<th scope="col">Include Quantity Box </th>
<th scope="col">Edit</th>
<th scope="col"><%= @action_title %></th>
</tr>
Expand Down
4 changes: 2 additions & 2 deletions app/views/specific_attribute_states/edit.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
</a>
<div class="d-none d-md-block" data-hideelement-target="hide_section">
<% if @specific_form_announcement.content.present? %>
<div class="bg-accordion">
<p><%= @specific_form_announcement.content %></p>
<div class="bg-accordion p-2 mb-3">
<%= @specific_form_announcement.content %>
</div>
<% end %>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/views/specific_attribute_states/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
</a>
<div class="d-none d-md-block" data-hideelement-target="hide_section">
<% if @specific_form_announcement.content.present? %>
<div class="bg-accordion">
<p><%= @specific_form_announcement.content %></p>
<div class="bg-accordion p-2 mb-3">
<%= @specific_form_announcement.content %>
</div>
<% end %>
</div>
Expand Down
Loading
Loading