Skip to content

Commit bda285b

Browse files
committed
Merged development into 126
2 parents e26f4d8 + 2329c0e commit bda285b

File tree

18 files changed

+149
-75
lines changed

18 files changed

+149
-75
lines changed

api/API/makeExcel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def makeLaborExcel():
126126

127127
# add titles
128128
worksheet.write(row, 0, 'Faculty/Proj. Title')
129-
worksheet.write(row, 1, '# Students')
129+
worksheet.write(row, 1, '#Students')
130130
worksheet.write(row, 2, 'Duration')
131131
worksheet.write(row, 3, 'Total')
132132
row += 1

api/config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ allProjectsTable:
5252
fieldName: "isServiceToCommunity"
5353
- title: "Comm. Partner"
5454
fieldName: "hasCommunityPartner" # Will this work with two?
55-
- title: "# Students"
55+
- title: "#Students"
5656
fieldName: "numberStudents"
5757
- title: "Created"
5858
fieldName: "createdDate"
@@ -173,7 +173,7 @@ budget:
173173
amountFieldName: "equipment"
174174
descFieldName: "equipmentDesc"
175175
- title: "Materials"
176-
placeholder: "Indicate the materials and supplies you know will be needed to conduct your research."
176+
placeholder: "Indicate the materials and supplies you know will be needed to conduct your research"
177177
amountFieldName: "materials"
178178
descFieldName: "materialsDesc"
179179
- title: "Travel "

api/pages/done.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def done_GET ():
1717
uploadedFiles = [];
1818

1919
if proj.status == cfg["projectStatus"]["Pending"]:
20-
flash("Application has already been submited.")
20+
flash("Application has already been submitted.")
2121
return redirect(url_for("main_with_username", username = g.user.username))
2222

2323
for files in cfg["filepaths"]["allowedFileNames"]:
@@ -42,7 +42,7 @@ def finalize_POST ():
4242
proj = getProject(g.user.username)
4343
proj.status = cfg["projectStatus"]["Pending"]
4444
proj.save()
45-
45+
flash("Application has been submitted." , "success")
4646
return redirect('/')
4747

4848

api/pages/irbyn.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def irbyn_GET ():
99
proj = getProject(g.user.username)
1010

1111
if proj.status == cfg["projectStatus"]["Pending"]:
12-
flash("Application has already been submited.")
12+
flash("Application has already been submitted.")
1313
return redirect(url_for("main_with_username", username = g.user.username))
1414

1515
return render_template ( "pages/irbyn.html",

api/static/js/pages/allLabor.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ function countLaborRows () {
1111
var duration = $("#row" + idx).find("td[name='duration']").text();
1212
console.log("Dur: " + duration);
1313
sum = (numStudents * duration * laborRate * 40);
14-
$("#rowTotal" + idx).html(sum.toFixed(2));
14+
$("#rowTotal" + idx).html("$" + sum.toFixed(2));
1515
grandTotal += sum;
1616
};
1717
$("#grandTotal").text("$" + grandTotal.toFixed(2));

api/static/js/pages/history.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,7 @@ var atLeastOneIsChecked = $('input[type=checkbox]:checked').length > 0;
2222
$("#submit").prop("disabled", true);
2323
}
2424

25-
}
25+
}
26+
$('input[type="checkbox"]').on('change', function() {
27+
$('input[type="checkbox"]').not(this).prop('checked', false);
28+
});

api/static/js/pages/setParameters.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,4 @@ $("#delete_parameters").click(function(e) {
6767
e.preventDefault();
6868
var linkURL = $(this).attr("href");
6969
warnBeforeRedirect(linkURL);
70-
});
70+
});

api/templates/chair/emailTemplate.html

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,38 @@
99
<h4 class="modal-title" id="emailLabel">Award Letter</h4>
1010
</div>
1111
<div class="modal-body" id="emailBody">
12+
<h5>Date: January 25, 2016
13+
To: Maggie Robillard
14+
From: Undergraduate Research and Creative Projects Program Committee Chair: Martin Veillette
15+
Members: Ian Norris, Wayne Messer, Kennaria Brown, Eric Pearson, Althea Webb<h5/>
16+
17+
<h5>Re: Summer 2017 Undergraduate Research and Creative Projects Program proposal
18+
19+
The Undergraduate Research and Creative Projects Program (URCPP) Committee is pleased to approve your request for funding for your summer 2017 faculty-student research project. The URCPP will fund $8300.00 on your project: Analyzing Trade Books and Other Print Media for Classroom Use, contingent on IRB approval if your research involves human subjects. Your program will run from May 29- July 26, 2017.
20+
21+
Your stipend of $5,300 will be disbursed in one payment in June. You will be notified by Jim Strand which account number to use to report expenses for your project. He also will provide instructions to follow for obtaining reimbursements. Be sure to stay within the approved budget amount mentioned above. If you receive additional funding for this project not already indicated in your proposal, please alert Sarah Broomfield, because that may affect your eligibility for this URCPP award.
22+
23+
Your project has been approved for working with 3 students -- yet to be determined. When you have selected your student researchers, send Sarah Broomfield their name(s) and B-numbers (send to [email protected]) and she will create an electronic labor status form which will be copied to the student, to you as the supervisor, and to the Student Labor Office. The student information will also be shared with the Student Service Center to enroll them in UGR 010 which, upon satisfactory completion, will earn an ALE credit, but does not earn credit towards graduation. Please be aware that students cannot be enrolled in another summer course at the same time as they are enrolled in UGR 010 (including the first four-week or eight-week summer sessions, internships, independent studies, other non-credit courses, etc.) and participate in summer research funded by the URCPP.
24+
25+
There are some requirements you must fulfill as a faculty member receiving URCPP funding. Failure to complete the following requirements will affect future URCPP funding.
26+
1. You are required to submit an “S” or “U” grade to Associate Registrar Kathy Wallace for each student’s participation in the research/creative project. Your grades must be submitted before Thanksgiving Break.
27+
2. You are required to administer a Pre-Research Survey and Post-Research Survey to each student working with your project. Details about the surveys will be forthcoming. You and your students must participate in the weekly summer discussions where student researchers will be asked to share the progress they are making on their research.
28+
3. You are required to electronically submit an abstract and a one-page summary of the project, which is due to the Academic Vice President’s Office no later than August 21, 2017. The abstract will be shared with the Development office (for donors) and published in the annual Journal of Undergraduate Research Abstracts, compiled by Ron Rosen; thus, it can be discipline-specific. The report is shared with the Academic Vice President and Dean of the Faculty and should be geared toward a more general audience.
29+
4. You are also required to participate in the Berea Undergraduate Research Symposium (BURS) in early October 2017.
30+
5. If your research involves human subjects, your funding is subject to IRB approval and you must complete and submit an application to the IRB by March 13, 2017. Please see the following definition in the faculty manual to confirm whether you research does or does need IRB approval http://catalog.berea.edu/en/Current/Catalog/Selected-Institution-Wide-Policies/Research-Involving-Human-Subjects). No URCPP funds will be dispersed to any research involving human subjects who has not received IRB approval. Questions regarding IRB application can be directed to the IRB chair, Wendy Williams ([email protected]).
31+
32+
If you have any questions, please feel free to contact any member of the URCPP Committee. Congratulations and best wishes on the project!
33+
34+
Sincerely,
35+
36+
37+
38+
Martin Veillette
39+
URCPC Chair
40+
41+
cc: Linda Strong-Leek
42+
43+
</h5>
1244
<input type = "text" id = "subject" class="form-control"/>
1345
<br>
1446
<textarea name="body" id="body" rows="10" cols="80">

api/templates/chair/setParameters.html

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ <h1>URCPP Parameters</h1>
3939
required
4040
step = "1"
4141
placeholder = "Enter a new URCPP year"
42+
oninput = "this.value = Math.abs(this.value)"
43+
min = "2015"
4244
/>
4345
</div>
4446
</div>
@@ -53,7 +55,7 @@ <h1>URCPP Parameters</h1>
5355
id = 'applicationOpenDate'
5456
class = 'form-control hasDatePicker'
5557
required
56-
placeholder = "yyyy/mm/dd"
58+
placeholder = "Choose the application open date"
5759
/>
5860
</div>
5961
</div>
@@ -68,7 +70,7 @@ <h1>URCPP Parameters</h1>
6870
id = 'applicationCloseDate'
6971
class = 'form-control hasDatePicker'
7072
required
71-
placeholder = "yyyy/mm/dd"
73+
placeholder = "Choose the application close date"
7274
/>
7375
</div>
7476
</div>
@@ -85,7 +87,9 @@ <h1>URCPP Parameters</h1>
8587
class = 'form-control quantity'
8688
required
8789
step = "0.01"
88-
placeholder = "Enter milage rate"
90+
placeholder = "Enter milage rate ($ per mile)"
91+
min = "0.00"
92+
oninput = "this.value = Math.abs(this.value)"
8993
/>
9094
</div>
9195
</div>
@@ -102,7 +106,9 @@ <h1>URCPP Parameters</h1>
102106
class = 'form-control quantity'
103107
required
104108
step = "0.01"
105-
placeholder = "Enter labor rate"
109+
placeholder = "Enter labor rate ($ per hour)"
110+
min = "0.00"
111+
oninput = "this.value = Math.abs(this.value)"
106112
/>
107113
</div>
108114
</div>

api/templates/committee/allBudgets.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ <h1> Budget Summary </h1>
1616
{% endif %}
1717
</ul>
1818
<p></p>
19-
<div class = "row" style = "margin-bottom: 20px; margin-top: 20px;"><strong style = "font-size: 125%;">Filter by Status: </strong>
19+
<div class = "row" style = "padding-top: 20px;"><strong style = "font-size: 125%;">Filter by Status: </strong>
2020
{% for status in cfg["projectStatus"] %}
2121
<input style = "margin-left: 10px; font-size: 125%;"
2222
type="checkbox"

0 commit comments

Comments
 (0)