Skip to content
This repository was archived by the owner on Oct 12, 2023. It is now read-only.

Commit ac2b394

Browse files
DevMattMDevMattM
committed
Merge branch 'release/1.4.0'
2 parents ff736ff + 0d7490e commit ac2b394

File tree

8 files changed

+101
-35
lines changed

8 files changed

+101
-35
lines changed

‎CHANGELOG

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
# [1.4.0] - 2018-01-19
2+
# Summary
3+
This release adds a new question to the FAQ and fixes a bug on the admin dashboard where
4+
searching for a user was not working.
5+
## Fixed
6+
* Fix bug where admin could not search by gatorlink in the QI Users List. (Akash Agarwal)
7+
## Added
8+
* Add a new question to the FAQ and adjust CSS to accomodate (Matthew McConnell)
9+
## Changed
10+
* Update placeholder text to say 'search by project title' (Matthew McConnell)
11+
112
## [1.3.1] - 2017-04-27
213
## Summary
314
This release fixs two bugs. One bug was in regards to the 'Pending project' count on the footer being incorrect, and the other was dealing with properly handling projects with no owner (initially imported).

‎qipr_approver/approver/constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,4 +120,4 @@
120120

121121
is_staging = True if os.environ['IS_STAGING'] == 'true' else False
122122

123-
VERSION_NUMBER = '1.3.1'
123+
VERSION_NUMBER = '1.4.0'

‎qipr_approver/approver/templates/approver/dashboard.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ <h3 class="center-align dashboard_projects-title">QI Projects for {{ person.firs
2424
<div class="input-field dashboard_search">
2525
<form method="post" action="{% url 'approver:dashboard' %}">
2626
{% csrf_token %}
27-
<input placeholder="Search your project title" class="dashboard_search-input" id="dash-search-text" type="search" name="search" value={{ search_query }} >
27+
<input placeholder="Search by Project Title" class="dashboard_search-input" id="dash-search-text" type="search" name="search" value={{ search_query }} >
2828

2929
<input class="dashboard__search--projects" type="submit" id="dash-search-button" value="&#128270;">
3030
</form>

‎qipr_approver/approver/templates/approver/index.html

Lines changed: 65 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -123,57 +123,95 @@ <h2 class="fcm__titles blue-text text-darken-4">manage</h2>
123123

124124
<!-- FAQs Section -->
125125
<section class="section sec-pad lighten-4">
126-
<div class="container">
127-
<div class="row home__section">
128-
<div class="col s12">
129-
<h2 class="header grey-text text-darken-3 center font__roboto">Frequently Asked Questions</h2>
130-
</div>
131-
<div class="col s12 l6 font__opensans">
126+
<div class="container home__section">
127+
<div class="row">
128+
<div class="col s12">
129+
<h2 class="header grey-text text-darken-3 center font__roboto">Frequently Asked Questions</h2>
130+
</div>
131+
</div>
132+
<div class="row">
133+
<div class="col s12 l6 font__opensans">
134+
<div class="row">
132135
<div class="shape__circle">
133136
<div class="shape__circle--text white-text">?</div>
134137
</div>
135138
<h5 class="text__blue">What is QIPR?</h5>
139+
</div>
140+
<div class="row">
136141
<p class="landing__FAQ--font landing__FAQ--padding">The Quality Improvement Project Registry (QIPR) for UF Health quality improvement projects. </p>
137142
</div>
138-
<div class="col s12 l6 font__opensans">
143+
</div>
144+
<div class="col s12 l6 font__opensans">
145+
<div class="row">
139146
<div class="shape__circle">
140147
<div class="shape__circle--text white-text">?</div>
141148
</div>
142-
<h5 class="text__blue">What do I need to get started?</h5>
143-
<ul class="landing__FAQ--font landing_FAQ--bullets">
144-
<li><a href="{{ registry_search_url }}">Search QIPR</a> to learn about existing quality improvement projects </li>
145-
<li>Make sure you have a mentor for your project if you are a resident/trainee/student</li>
146-
<li>Complete <a target="_blank" href="{% static 'qipr/img/process_improvement_team_charter.pdf' %}">QI project charter</a></li>
147-
</ul>
148-
</div>
149-
<div class="col s12 l6 font__opensans">
149+
<div class="valign-wrapper"><h5 class="text__blue">Are there differences between Quality Improvement and Research?</h5></div>
150+
</div>
151+
<div class="row">
152+
<p class="landing__FAQ--font">Yes, there are several important distinctions between quality improvement/quality assurance and research. To read more about these differences, visit the IRB’s webpage: <a href="http://irb.ufl.edu/irb01/researcher-information/qaqi-vs-research.html">QA/QI vs Research</a></p>
153+
</div>
154+
</div>
155+
</div>
156+
<div class="row">
157+
<div class="col s12 l6 font__opensans">
158+
<div class="row">
150159
<div class="shape__circle">
151160
<div class="shape__circle--text white-text">?</div>
152161
</div>
153162
<h5 class="text__blue">Why should I use QIPR?</h5>
163+
</div>
164+
<div class="row">
154165
<ul class="landing__FAQ--font landing__FAQ--padding landing_FAQ--bullets">
155166
<li>Share your QI projects, learn from others, and see current improvement projects to connect and collaborate</li>
156167
<li>Apply credit to New Innovations (for Residents and Magnet only)</li>
157168
<li>Access to BMJ Quality website to manage projects and facilitate QI publications and presentations</li>
158169
<li>Access to Quality Department experts and data resources</li>
159170
</ul>
171+
</div>
160172
</div>
161173
<div class="col s12 l6 font__opensans">
162-
<div class="shape__circle">
163-
<div class="shape__circle--text white-text">?</div>
174+
<div class="row">
175+
<div class="shape__circle">
176+
<div class="shape__circle--text white-text">?</div>
177+
</div>
178+
<h5 class="text__blue">What do I need to get started?</h5>
179+
</div>
180+
<div class="row">
181+
<ul class="landing__FAQ--font landing_FAQ--bullets">
182+
<li><a href="{{ registry_search_url }}">Search QIPR</a> to learn about existing quality improvement projects </li>
183+
<li>Make sure you have a mentor for your project if you are a resident/trainee/student</li>
184+
<li>Complete <a target="_blank" href="{% static 'qipr/img/process_improvement_team_charter.pdf' %}">QI project charter</a></li>
185+
</ul>
164186
</div>
165-
<h5 class="text__blue">Do I need IRB approval?</h5>
166-
<p class="landing__FAQ--font">Most QI projects do not require IRB approval if they meet <a href="{% static 'qipr/img/criteria_qi_projects.pdf' %}" target="_blank">QI criteria</a>. If the project does not meet <a href="{% static 'qipr/img/criteria_qi_projects.pdf' %}" target="_blank">QI criteria</a>, the IRB will need to review the project. QIPR will help to determine if the project meets <a href="{% static 'qipr/img/criteria_qi_projects.pdf' %}" target="_blank">QI criteria</a>.</p>
167187
</div>
168-
<div class="col s12 l6 font__opensans clear__both">
169-
<div class="shape__circle">
170-
<div class="shape__circle--text white-text">?</div>
188+
</div>
189+
<div class="row">
190+
<div class="col s12 l6 font__opensans">
191+
<div class="row">
192+
<div class="shape__circle">
193+
<div class="shape__circle--text white-text">?</div>
194+
</div>
195+
<h5 class="text__blue">Do I need IRB approval?</h5>
171196
</div>
172-
<h5 class="text__blue">How can I get help? </h5>
173-
<ul class="landing__FAQ--font landing__FAQ--padding landing_FAQ--bullets">
174-
<li>Visit the <a href="https://ufhealth.org/quality-and-patient-safety/welcome" target="_blank">Quality Improvement Resources and Education</a> website</li>
175-
<li>Call us <a href="tel:352-265-0002">352-265-0002</a></li>
176-
</ul>
197+
<div class="row">
198+
<p class="landing__FAQ--font">Most QI projects do not require IRB approval if they meet <a href="{% static 'qipr/img/criteria_qi_projects.pdf' %}" target="_blank">QI criteria</a>. If the project does not meet <a href="{% static 'qipr/img/criteria_qi_projects.pdf' %}" target="_blank">QI criteria</a>, the IRB will need to review the project. QIPR will help to determine if the project meets <a href="{% static 'qipr/img/criteria_qi_projects.pdf' %}" target="_blank">QI criteria</a>.</p>
199+
</div>
200+
</div>
201+
<div class="col s12 l6 font__opensans">
202+
<div class="row">
203+
<div class="shape__circle">
204+
<div class="shape__circle--text white-text">?</div>
205+
</div>
206+
<h5 class="text__blue">How can I get help? </h5>
207+
</div>
208+
<div class="row">
209+
<ul class="landing__FAQ--font landing__FAQ--padding landing_FAQ--bullets">
210+
<li>Visit the <a href="https://ufhealth.org/quality-and-patient-safety/welcome" target="_blank">Quality Improvement Resources and Education</a> website</li>
211+
<li>Call us <a href="tel:352-265-0002">352-265-0002</a></li>
212+
</ul>
213+
</div>
214+
</div>
177215
</div>
178216
</div>
179217
</div>

‎qipr_approver/approver/templates/approver/userlist.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ <h1 class="question__header font__opensans"><i class="icon__admin medium materia
3131
</div>
3232
<div class="col s12">
3333
<div class="input-field dashboard_search">
34-
<form method="post" action="{% url 'approver:dashboard_su' %}">
34+
<form method="post" action="{% url 'approver:userlist' %}">
3535
{% csrf_token %}
36-
<input placeholder="Search user" class="dashboard_search-input" id="search" type="search" name="search" value={{ search_query }} >
37-
<input class="dashboard__search--projects" type="submit" value="&#128270;">
36+
<input placeholder="Search by Gatorlink" class="dashboard_search-input" id="userlist-search-text" type="search" name="search" value={{ search_query }} >
37+
<input class="dashboard__search--projects" id="userlist-search-button" type="submit" value="&#128270;">
3838
</form>
3939
</div>
4040
</div>

‎qipr_approver/approver/views/userlist.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,19 @@
66
import approver.utils as utils
77
from approver.models import Person
88
from approver.constants import users_per_page
9+
from django.db.models import Q
910

1011
@login_required
1112
@user_passes_test(lambda u: u.person.is_admin)
1213
def userlist(request):
13-
if request.method == 'GET':
14+
if request.method == 'GET' or request.POST.get('search') is not None:
1415
persons_page = []
15-
person_list = Person.objects.all()
16+
search_query = ""
17+
if(request.POST.get('search') is not None):
18+
search_query = request.POST.get('search')
19+
person_list = Person.objects.filter(Q(gatorlink__icontains=search_query))
20+
else:
21+
person_list = Person.objects.all()
1622
paginator = Paginator(person_list, users_per_page)
1723
page = request.GET.get('page')
1824
if page =='all':
@@ -28,6 +34,7 @@ def userlist(request):
2834
'content': 'approver/userlist.html',
2935
'persons_page': persons_page,
3036
'show_all': page == 'all',
37+
'search_query': search_query,
3138
'toast_text': utils.get_and_reset_toast(request.session),
3239
}
3340
return utils.layout_render(request, context)

‎qipr_approver/static/qipr/css/main.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ textarea.materialize-textarea:focus:not([readonly]) {
9090

9191
.text__blue {
9292
color: #004d9a;
93-
height: 4rem;
9493
padding-top: .5rem;
94+
margin-top: 0;
9595
}
9696

9797
.signin {

‎qipr_approver/static/qipr/js/app.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,16 @@
314314
});
315315
}
316316

317+
window.userSearch = document.getElementById('userlist-search-text');
318+
319+
if (window.userSearch) {
320+
window.userSearch.addEventListener('keypress', function (event) {
321+
if (event.keyCode == 13) {
322+
document.getElementById('userlist-search-button').click();
323+
}
324+
});
325+
}
326+
317327
// if the other option in self classification on the about you form is selected,
318328
// show a new text box for the customer to write in the other classification
319329
self_classification = document.getElementById('select-self_classification');

0 commit comments

Comments
 (0)