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

Jump to bottom

KG - Refactor Dashboard/Protocols/Show Panels For Bootstrap Panel Group #1070

Merged
merged 4 commits into from
Oct 4, 2017
Merged

KG - Refactor Dashboard/Protocols/Show Panels For Bootstrap Panel Group #1070

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3f360ef
refactor styles to utilize bootstrap's panel-group styles
Aug 17, 2017
bddd180
merge conflicts
Aug 25, 2017
9e3dd72
merge conflicts
Aug 25, 2017
ad31b32
Merge branch 'v3.0.0b' into kg-dashboard_panel_style_refactor
Stuart-Johnson Oct 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions app/assets/stylesheets/dashboard/protocol.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,3 @@ textarea {
.filter-identifier {
margin-left: 10px;
}

.spacing-above {
margin-top: 5px;
}
4 changes: 2 additions & 2 deletions app/views/additional_details/submissions/_submissions_panel.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- if submissions.any?
.panel.panel-default
.additional-details-submissions-panel.panel.panel-default{ display_if(submissions.any?) }
- if submissions.any?
.panel-heading
%h4.panel-title
= t(:additional_details)[:submissions][:completed_forms]
Expand Down
2 changes: 1 addition & 1 deletion app/views/additional_details/submissions/create.js.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<% if @submission.save %>
swal("Success!", "Submission saved", "success")
$("#submissionModal").modal('hide')
$(".additional-details-submissions-panel").html("<%= j render 'submissions_panel', protocol: @protocol, submissions: @submissions %>")
$(".additional-details-submissions-panel").replaceWith("<%= j render 'submissions_panel', protocol: @protocol, submissions: @submissions %>")
$('.document-management-submissions').html("<%= j render 'additional_details/document_management_submissions', service_request: @service_request %>")
$("#service-requests-panel").html("<%= j render 'dashboard/service_requests/service_requests', protocol: @protocol, permission_to_edit: @permission_to_edit, user: @user, view_only: false, show_view_ssr_back: false %>")
$('.service-requests-table').bootstrapTable()
Expand Down
4 changes: 2 additions & 2 deletions app/views/additional_details/submissions/destroy.js.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<% if @submission.destroy %>
<% if params[:protocol_id] && params[:sr_id] %>
$('.additional-details-submissions-panel').html("<%= j render 'submissions_panel', protocol: @protocol %>")
$('.additional-details-submissions-panel').replaceWith("<%= j render 'submissions_panel', protocol: @protocol %>")
<% end %>
<% if params[:protocol_id] && params[:ssr_id] %>
$('.additional-details-submissions-panel').html("<%= j render 'submissions_panel', protocol: @protocol, submissions: @submissions %>")
$('.additional-details-submissions-panel').replaceWith("<%= j render 'submissions_panel', protocol: @protocol, submissions: @submissions %>")
$('.document-management-submissions').html("<%= j render 'additional_details/document_management_submissions', service_request: @service_request %>")
$("#service-requests-panel").html("<%= j render 'dashboard/service_requests/service_requests', protocol: @protocol, permission_to_edit: @permission_to_edit, user: @user, view_only: false, show_view_ssr_back: false %>")
$('.service-requests-table').bootstrapTable()
Expand Down
2 changes: 1 addition & 1 deletion app/views/additional_details/submissions/update.js.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.~

<% if @submission.save %>
$('.additional-details-submissions-panel').html("<%= j render 'submissions_panel', protocol: @protocol, submissions: @submissions %>")
$('.additional-details-submissions-panel').replaceWith("<%= j render 'submissions_panel', protocol: @protocol, submissions: @submissions %>")
swal("Success!", "Submission saved", "success")
$('#submissionModal').modal('hide')
<% else %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/dashboard/milestones/update.js.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR~
# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.~

$('.milestones-panel').html("<%= j render 'dashboard/protocols/milestone', protocol: @protocol %>")
$('.milestones-panel').replaceWith("<%= j render 'dashboard/protocols/milestone', protocol: @protocol %>")
$(".datetimepicker:not(.time)").datetimepicker(format: 'MM/DD/YYYY', allowInputToggle: true)
$('.datetimepicker.time').datetimepicker(format: 'hh:mm A', allowInputToggle: true)
$(".selectpicker").selectpicker()
Expand Down
2 changes: 1 addition & 1 deletion app/views/dashboard/protocols/_milestone.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR~
-# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.~

.panel.panel-default
.milestones-panel.panel.panel-default
.panel-heading
%h4.panel-title
= t(:dashboard)[:protocols][:milestones][:title]
Expand Down
6 changes: 2 additions & 4 deletions app/views/dashboard/protocols/show.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,8 @@
= render 'dashboard/associated_users/table', protocol: @protocol, permission_to_edit: @permission_to_edit || @admin
= render 'dashboard/documents/documents_table', protocol: @protocol, permission_to_edit: @permission_to_edit || @admin
= render 'dashboard/service_requests/service_requests', protocol: @protocol, super_user_orgs: @super_user_orgs, permission_to_edit: @permission_to_edit, user: @user, view_only: false, show_view_ssr_back: @show_view_ssr_back, statuses_hidden: %(first_draft)
.additional-details-submissions-panel
= render "additional_details/submissions/submissions_panel", protocol: @protocol, submissions: @submissions
.milestones-panel.spacing-above
= render "dashboard/protocols/milestone", protocol: @protocol
= render "additional_details/submissions/submissions_panel", protocol: @protocol, submissions: @submissions
= render "dashboard/protocols/milestone", protocol: @protocol

= render 'additional_details/submissions/submission_modal'

Expand Down