Skip to content

Commit

Permalink
Improved details style
Browse files Browse the repository at this point in the history
  • Loading branch information
@TKasekamp
TKasekamp committed Dec 4, 2016
1 parent ef5adce commit 47f7542
Show file tree
Hide file tree
Showing 3 changed files with 92 additions and 144 deletions.
50 changes: 12 additions & 38 deletions src/main/resources/templates/fragments/detail/request_detail_consultant_feedback.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,45 +5,19 @@
<body>
<div th:fragment="request-detail-consultant-feedback">
<div class="col-md-12">
<div>
<label class="col-sm-2 control-label text-left">Element of discussion</label>
<div class="col-sm-10">
<label class="text-left" th:text="${consultation.getConsultantFeedback().discussionElement}"
th:if="${consultation.getConsultantFeedback().discussionElement!=null}"></label>
</div>
</div>
<dl class="dl-vertical">
<dt>Element of discussion</dt>
<dd th:text="${consultation.getConsultantFeedback().discussionElement}"></dd>
<dt>What materials did you work with?</dt>
<dd th:text="${consultation.getConsultantFeedback().discussedMaterial}"></dd>
<dt>What did you cover?</dt>
<dd th:text="${consultation.getConsultantFeedback().coveredIssues}"></dd>
<dt>New consultation?</dt>
<dd th:if="${consultation.getConsultantFeedback().suggestedNewConsultation!=null}"></dd>
<dt>Comments</dt>
<dd th:utext="${consultation.getConsultantFeedback().summary}"></dd>
</dl>

<div class="form-group">
<label class="col-sm-2 control-label text-left">What materials did you work with?</label>
<div class="col-sm-10">
<label class="text-left" th:text="${consultation.getConsultantFeedback().discussedMaterial}"
th:if="${consultation.getConsultantFeedback().discussedMaterial!=null}"></label>
</div>
</div>

<div class="form-group">
<label class="col-sm-2 control-label text-left">What did you cover?</label>
<div class="col-sm-10">
<label class="text-left" th:text="${consultation.getConsultantFeedback().coveredIssues}"
th:if="${consultation.getConsultantFeedback().coveredIssues!=null}"></label>
</div>
</div>

<div class="form-group">
<label class="col-sm-2 control-label text-left">New consultation?</label>
<div class="col-sm-10">
<label class="text-left"
th:text="${consultation.getConsultantFeedback().suggestedNewConsultation}"
th:if="${consultation.getConsultantFeedback().suggestedNewConsultation!=null}"></label>
</div>
</div>

<div class="form-group">
<label class="col-sm-2 control-label text-left">Comments</label>
<div class="col-sm-10">
<label class="text-left" th:utext="${consultation.getConsultantFeedback().summary}"></label>
</div>
</div>

</div>
</div>
Expand Down
66 changes: 16 additions & 50 deletions src/main/resources/templates/fragments/detail/request_detail_student_feedback.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,59 +6,25 @@
<div th:fragment="request-detail-student-feedback">

<div class="col-md-12">
<div>
<label class="col-sm-3 control-label text-left">Have you had peer consultation before?</label>
<div class="col-sm-9">
<label class="text-left" th:text="Yes"
th:if="${consultation.getStudentFeedback().firstConsultation==true}"></label> <label
class="control-label text-right" th:text="No"
th:if="${consultation.getStudentFeedback().firstConsultation!=true}"></label>
</div>
</div>

<div class="form-group">
<label class="col-sm-3 control-label text-left">Was the consultation useful?</label>
<div class="col-sm-9">
<label class="text-left" th:text="Yes"
th:if="${consultation.getStudentFeedback().useful==true}"></label> <label
class="control-label text-right" th:text="No"
th:if="${consultation.getStudentFeedback().useful!=true}"></label>
</div>
</div>

<div class="form-group">
<label class="col-sm-3 control-label text-left">Provided enough support?</label>
<div class="col-sm-9">
<label class="text-left" th:text="Yes"
th:if="${consultation.getStudentFeedback().providedSupport==true}"></label> <label
class="control-label text-right" th:text="No"
th:if="${consultation.getStudentFeedback().providedSupport!=true}"></label>
</div>
</div>

<div class="form-group">
<label class="col-sm-3 control-label text-left">Will you back again?</label>
<div class="col-sm-9">
<label class="text-left" th:text="Yes"
th:if="${consultation.getStudentFeedback().comingBack==true}"></label> <label
class="control-label text-right" th:text="No"
th:if="${consultation.getStudentFeedback().comingBack!=true}"></label>
</div>
</div>

<div class="form-group">
<label class="col-sm-3 control-label text-left">Comments</label>
<div class="col-sm-9">
<label class="text-left" th:utext="${consultation.getStudentFeedback().comments}"
th:if="${consultation.getStudentFeedback().comments!=true}"></label>
</div>
</div>
<dl class="dl-vertical">
<dt>Have you had peer consultation before?</dt>
<dd th:text="Yes" th:if="${consultation.getStudentFeedback().firstConsultation==true}"></dd>
<dd th:text="No" th:if="${consultation.getStudentFeedback().firstConsultation!=true}"></dd>
<dt>Was the consultation useful?</dt>
<dd th:text="Yes" th:if="${consultation.getStudentFeedback().useful==true}"></dd>
<dd th:text="No" th:if="${consultation.getStudentFeedback().useful!=true}"></dd>
<dt>Provided enough support?</dt>
<dd th:text="Yes" th:if="${consultation.getStudentFeedback().providedSupport==true}"></dd>
<dd th:text="No" th:if="${consultation.getStudentFeedback().providedSupport!=true}"></dd>
<dt>Will you come back again?</dt>
<dd th:text="Yes" th:if="${consultation.getStudentFeedback().comingBack==true}"></dd>
<dd th:text="No" th:if="${consultation.getStudentFeedback().comingBack!=true}"></dd>
<dt>Comments</dt>
<dd th:utext="${consultation.getStudentFeedback().comments}"></dd>
</dl>

</div>
</div>




</body>
</html>
120 changes: 64 additions & 56 deletions src/main/resources/templates/shared-between-consultant-and-admin/detail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,80 +30,88 @@ <h3 class="animated fadeInLeft">Detail Request</h3>
</div>
</div>

<div class="col-md-12" style="padding: 20px;">
<div class="col-md-12 padding-0">
<div class="col-md-12 padding-0">
<div class="col-md-12 padding-0">

<div class="col-md-12">

<div class="panel panel-default">
<div class="panel-heading">
<strong>Request Info</strong>
</div>
<div class="panel-body">
<div class="panel panel-default">
<div class="panel-heading">
<strong>Request Info</strong>
</div>
<div class="panel-body">
<div th:replace="fragments/detail/request_detail_info :: request_detail_info"></div>
</div>
<div th:replace="fragments/detail/request_detail_info :: request_detail_info"></div>
</div>

</div>
</div>
</div>

<div class="panel panel-default">
<div class="panel-heading">
<strong>Comment On Request</strong>
</div>
<div class="panel-body">
<div class="col-sm-10">
<label for="name" th:utext="${consultation.comments}"></label>
</div>
</div>
<div class="col-md-12">
<div class="panel panel-default">
<div class="panel-heading">
<strong>Comment On Request</strong>
</div>
<div class="panel-body">
<div class="col-sm-10">
<label for="name" th:utext="${consultation.comments}"></label>
</div>

<div class="panel panel-default">
<div class="panel-heading">
<strong>Request Related Dates</strong>
</div>
<div class="panel-body">
<div th:replace="fragments/detail/request_detail_date :: request_detail_date"></div>
</div>
</div>
</div>
</div>
<div class="col-md-12">
<div class="panel panel-default">
<div class="panel-heading">
<strong>Request Related Dates</strong>
</div>
<div class="panel-body">
<div th:replace="fragments/detail/request_detail_date :: request_detail_date"></div>
</div>
</div>
</div>
<div class="col-md-12 padding-0">
<div class="col-md-6">
<div class="panel panel-default" th:if="${consultation.hasStudentFeedback()}">
<div class="panel-heading">
<strong>Student Feedback</strong>
</div>

<div class="panel panel-default" th:if="${consultation.hasStudentFeedback()}">
<div class="panel-heading">
<strong>Student Feedback</strong>
</div>
<div class="panel-body">
<div th:replace="fragments/detail/request_detail_student_feedback :: request-detail-student-feedback"></div>
</div>
<div class="panel-body">
<div
th:replace="fragments/detail/request_detail_student_feedback :: request-detail-student-feedback"></div>
</div>

<div class="panel panel-default" th:if="${consultation.getConsultantFeedback() != null}">
<div class="panel-heading">
<strong>Consultant Feedback</strong>
</div>
<div class="panel-body">
<div
th:replace="fragments/detail/request_detail_consultant_feedback :: request-detail-consultant-feedback">
</div>
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default" th:if="${consultation.getConsultantFeedback() != null}">
<div class="panel-heading">
<strong>Consultant Feedback</strong>
</div>

<div class="panel panel-default"
th:if="${(consultation.getNext()!=null) or (consultation.getPrevious()!=null)} ">
<div class="panel-body">
<div
th:replace="fragments/detail/request_detail_links_to_prvious_or_next_consultation :: request_detail_links_to_prvious_or_next_consultation"></div>
<div class="panel-body">
<div
th:replace="fragments/detail/request_detail_consultant_feedback :: request-detail-consultant-feedback">
</div>
</div>


</div>
</div>
</div>
<div class="col-md-12">
<div class="panel panel-default"
th:if="${(consultation.getNext()!=null) or (consultation.getPrevious()!=null)} ">
<div class="panel-body">
<div
th:replace="fragments/detail/request_detail_links_to_prvious_or_next_consultation :: request_detail_links_to_prvious_or_next_consultation"></div>
</div>
</div>
</div>
</div>

</div>
</div>







</div>
</div>


<!-- start: Mobile -->
Expand Down

0 comments on commit 47f7542

Please sign in to comment.