Removed FAQ from emails; Fixed issue with extension/acknowledgement w…

…ith three digit number of days
CityOfNewYork · May 11, 2016 · a4c1022 · a4c1022
1 parent 194a8d9
commit a4c1022
Show file tree

Hide file tree

Showing 39 changed files with 37 additions and 177 deletions.
diff --git a/public_records_portal/db_helpers.py b/public_records_portal/db_helpers.py
@@ -516,7 +516,7 @@ def change_request_status(request_id, status):
     date_created = req.date_received or req.date_created
     date_created = cal.adjust(date_created, FOLLOWING)
     if "days" in status:
-            days_to_fulfill = re.findall(r"(\d{2}) days",status)[0]
+            days_to_fulfill = re.findall(r"(\d{2,3}) days",status)[0]
             app.logger.info("Changing Due Date: %s " % cal.addbusdays(date_created, int(days_to_fulfill)))
             req.due_date = cal.addbusdays(date_created, int(days_to_fulfill))
     db.session.commit()

diff --git a/public_records_portal/templates/edit_templates/email_acknowledgement.html b/public_records_portal/templates/edit_templates/email_acknowledgement.html
@@ -20,9 +20,6 @@
                                     You can view the request and take any necessary action at the following webpage:
                                     <a href='{{ page }}'>{{ page }}</a>.
                                 </p>
-                                <p>
-                                    Click <a href="FAQ PAGE">here</a> to learn about how the City responds to FOIL requests.
-                                </p>
                                 </br>
                                 {% if unfollow_link %}
                                     <p>

diff --git a/public_records_portal/templates/edit_templates/email_city_response_added.html b/public_records_portal/templates/edit_templates/email_city_response_added.html
@@ -14,9 +14,6 @@
                                     You can view the request and take any necessary action at the following webpage:
                                     <a href='{{ page }}'>{{ page }}</a>.
                                 </p>
-                                <p>
-                                    Click <a href="faq">here</a> to learn about how the City responds to FOIL requests.
-                                </p>
                                 </br>
                                 {% if unfollow_link %}
                                     <p>

diff --git a/public_records_portal/templates/edit_templates/email_closed.html b/public_records_portal/templates/edit_templates/email_closed.html
@@ -19,9 +19,6 @@
                                     You can view the request and take any necessary action at the following webpage:
                                     <a href='{{ page }}'>{{ page }}</a>.
                                 </p>
-                                <p>
-                                    Click <a href="FAQ PAGE">here</a> to learn about how the City responds to FOIL requests.
-                                </p>
                                 </br>
                                 {% if unfollow_link %}
                                     <p>

diff --git a/public_records_portal/templates/edit_templates/email_closed_fulfilled_in_whole.html b/public_records_portal/templates/edit_templates/email_closed_fulfilled_in_whole.html
@@ -20,9 +20,6 @@
                                     You can view the request and take any necessary action at the following webpage:
                                     <a href='{{ page }}'>{{ page }}</a>.
                                 </p>
-                                <p>
-                                    Click <a href="FAQ PAGE">here</a> to learn about how the City responds to FOIL requests.
-                                </p>
                                 </br>
                                 {% if unfollow_link %}
                                     <p>

diff --git a/public_records_portal/templates/edit_templates/email_extension.html b/public_records_portal/templates/edit_templates/email_extension.html
@@ -20,9 +20,6 @@
                                     You can view the request and take any necessary action at the following webpage:
                                     <a href='{{ page }}'>{{ page }}</a>.
                                 </p>
-                                <p>
-                                    Click <a href="app.config['PUBLIC_APPLICATION_URL']faq">here</a> to learn about how the City responds to FOIL requests.
-                                </p>
                                 </br>
                                 {% if unfollow_link %}
                                     <p>

diff --git a/public_records_portal/templates/email_templates/email_acknowledgement.html b/public_records_portal/templates/email_templates/email_acknowledgement.html
@@ -20,9 +20,7 @@
                                     You can view the request and take any necessary action at the following webpage:
                                     <a href='{{ page }}'>{{ page }}</a>.
                                 </p>
-                                <p>
-                                    Click <a href="FAQ PAGE">here</a> to learn about how the City responds to FOIL requests.
-                                </p>
+
                                 </br>
                                 {% if unfollow_link %}
                                     <p>
@@ -39,4 +37,4 @@
             </div>
         </div>
     </body>
-</html>
+</html>
diff --git a/public_records_portal/templates/email_templates/email_acknowledgement_agency.html b/public_records_portal/templates/email_templates/email_acknowledgement_agency.html
@@ -19,9 +19,6 @@
                                     You can view the request and take any necessary action at the following webpage:
                                     <a href='{{ page }}'>{{ page }}</a>.
                                 </p>
-                                <p>
-                                    Click <a href="FAQ PAGE">here</a> to learn about how the City responds to FOIL requests.
-                                </p>
                                 </br>
                                 {% if unfollow_link %}
                                     <p>
@@ -38,4 +35,4 @@
             </div>
         </div>
     </body>
-</html>
+</html>
diff --git a/public_records_portal/templates/email_templates/email_add_note.html b/public_records_portal/templates/email_templates/email_add_note.html
@@ -23,9 +23,6 @@
                                     You can view the request and take any necessary action at the following webpage:
                                     <a href='{{ page }}'>{{ page }}</a>.
                                 </p>
-                                <p>
-                                    Click <a href="FAQ PAGE">here</a> to learn about how the City responds to FOIL requests.
-                                </p>
                                 </br>
                                 {% if unfollow_link %}
                                     <p>
@@ -42,4 +39,4 @@
             </div>
         </div>
     </body>
-</html>
+</html>
diff --git a/public_records_portal/templates/email_templates/email_city_response_added.html b/public_records_portal/templates/email_templates/email_city_response_added.html
@@ -20,9 +20,6 @@
                                     You can view the request and take any necessary action at the following webpage:
                                     <a href='{{ page }}'>{{ page }}</a>.
                                 </p>
-                                <p>
-                                    Click <a href="FAQ PAGE">here</a> to learn about how the City responds to FOIL requests.
-                                </p>
                                 </br>
                                 {% if unfollow_link %}
                                     <p>
@@ -39,4 +36,4 @@
             </div>
         </div>
     </body>
-</html>
+</html>
diff --git a/public_records_portal/templates/email_templates/email_closed_by_email.html b/public_records_portal/templates/email_templates/email_closed_by_email.html
@@ -21,9 +21,6 @@
                                     You can view the request and take any necessary action at the following webpage:
                                     <a href='{{ page }}'>{{ page }}</a>.
                                 </p>
-                                <p>
-                                    Click <a href="FAQ PAGE">here</a> to learn about how the City responds to FOIL requests.
-                                </p>
                                 </br>
                                 {% if unfollow_link %}
                                     <p>
@@ -40,4 +37,4 @@
             </div>
         </div>
     </body>
-</html>
+</html>
diff --git a/public_records_portal/templates/email_templates/email_closed_by_fax.html b/public_records_portal/templates/email_templates/email_closed_by_fax.html
@@ -20,9 +20,6 @@
                                     You can view the request and take any necessary action at the following webpage:
                                     <a href='{{ page }}'>{{ page }}</a>.
                                 </p>
-                                <p>
-                                    Click <a href="FAQ PAGE">here</a> to learn about how the City responds to FOIL requests.
-                                </p>
                                 </br>
                                 {% if unfollow_link %}
                                     <p>
@@ -39,4 +36,4 @@
             </div>
         </div>
     </body>
-</html>
+</html>
diff --git a/public_records_portal/templates/email_templates/email_closed_by_mail.html b/public_records_portal/templates/email_templates/email_closed_by_mail.html
@@ -20,9 +20,6 @@
                                     You can view the request and take any necessary action at the following webpage:
                                     <a href='{{ page }}'>{{ page }}</a>.
                                 </p>
-                                <p>
-                                    Click <a href="FAQ PAGE">here</a> to learn about how the City responds to FOIL requests.
-                                </p>
                                 </br>
                                 {% if unfollow_link %}
                                     <p>
@@ -39,4 +36,4 @@
             </div>
         </div>
     </body>
-</html>
+</html>
diff --git a/public_records_portal/templates/email_templates/email_closed_by_pickup.html b/public_records_portal/templates/email_templates/email_closed_by_pickup.html
@@ -20,9 +20,6 @@
                                     You can view the request and take any necessary action at the following webpage:
                                     <a href='{{ page }}'>{{ page }}</a>.
                                 </p>
-                                <p>
-                                    Click <a href="FAQ PAGE">here</a> to learn about how the City responds to FOIL requests.
-                                </p>
                                 </br>
                                 {% if unfollow_link %}
                                     <p>
@@ -39,4 +36,4 @@
             </div>
         </div>
     </body>
-</html>
+</html>
diff --git a/public_records_portal/templates/email_templates/email_closed_fulfilled_in_part.html b/public_records_portal/templates/email_templates/email_closed_fulfilled_in_part.html
@@ -26,9 +26,6 @@
                                     You can view the request and take any necessary action at the following webpage:
                                     <a href='{{ page }}'>{{ page }}</a>.
                                 </p>
-                                <p>
-                                    Click <a href="FAQ PAGE">here</a> to learn about how the City responds to FOIL requests.
-                                </p>
                                 </br>
                                 {% if unfollow_link %}
                                     <p>
@@ -45,4 +42,4 @@
             </div>
         </div>
     </body>
-</html>
+</html>
diff --git a/public_records_portal/templates/email_templates/email_closed_fulfilled_in_whole.html b/public_records_portal/templates/email_templates/email_closed_fulfilled_in_whole.html
@@ -20,9 +20,6 @@
                                     You can view the request and take any necessary action at the following webpage:
                                     <a href='{{ page }}'>{{ page }}</a>.
                                 </p>
-                                <p>
-                                    Click <a href="FAQ PAGE">here</a> to learn about how the City responds to FOIL requests.
-                                </p>
                                 </br>
                                 {% if unfollow_link %}
                                     <p>
@@ -39,4 +36,4 @@
             </div>
         </div>
     </body>
-</html>
+</html>
diff --git a/public_records_portal/templates/email_templates/email_closed_missing_information.html b/public_records_portal/templates/email_templates/email_closed_missing_information.html
@@ -22,9 +22,6 @@
                                     You can view the request and take any necessary action at the following webpage:
                                     <a href='{{ page }}'>{{ page }}</a>.
                                 </p>
-                                <p>
-                                    Click <a href="FAQ PAGE">here</a> to learn about how the City responds to FOIL requests.
-                                </p>
                                 </br>
                                 {% if unfollow_link %}
                                     <p>
@@ -41,4 +38,4 @@
             </div>
         </div>
     </body>
-</html>
+</html>
diff --git a/public_records_portal/templates/email_templates/email_closed_no_payment.html b/public_records_portal/templates/email_templates/email_closed_no_payment.html
@@ -24,9 +24,6 @@
                                     You can view the request and take any necessary action at the following webpage:
                                     <a href='{{ page }}'>{{ page }}</a>.
                                 </p>
-                                <p>
-                                    Click <a href="FAQ PAGE">here</a> to learn about how the City responds to FOIL requests.
-                                </p>
                                 </br>
                                 {% if unfollow_link %}
                                     <p>
@@ -43,4 +40,4 @@
             </div>
         </div>
     </body>
-</html>
+</html>
diff --git a/public_records_portal/templates/email_templates/email_closed_no_records_available.html b/public_records_portal/templates/email_templates/email_closed_no_records_available.html
@@ -23,9 +23,6 @@
                                     You can view the request and take any necessary action at the following webpage:
                                     <a href='{{ page }}'>{{ page }}</a>.
                                 </p>
-                                <p>
-                                    Click <a href="FAQ PAGE">here</a> to learn about how the City responds to FOIL requests.
-                                </p>
                                 </br>
                                 {% if unfollow_link %}
                                     <p>
@@ -42,4 +39,4 @@
             </div>
         </div>
     </body>
-</html>
+</html>
diff --git a/public_records_portal/templates/email_templates/email_closed_no_response.html b/public_records_portal/templates/email_templates/email_closed_no_response.html
@@ -24,9 +24,6 @@
                                     You can view the request and take any necessary action at the following webpage:
                                     <a href='{{ page }}'>{{ page }}</a>.
                                 </p>
-                                <p>
-                                    Click <a href="FAQ PAGE">here</a> to learn about how the City responds to FOIL requests.
-                                </p>
                                 </br>
                                 {% if unfollow_link %}
                                     <p>
@@ -43,4 +40,4 @@
             </div>
         </div>
     </body>
-</html>
+</html>
diff --git a/public_records_portal/templates/email_templates/email_closed_non-city_record.html b/public_records_portal/templates/email_templates/email_closed_non-city_record.html
@@ -23,9 +23,6 @@
                                     You can view the request and take any necessary action at the following webpage:
                                     <a href='{{ page }}'>{{ page }}</a>.
                                 </p>
-                                <p>
-                                    Click <a href="FAQ PAGE">here</a> to learn about how the City responds to FOIL requests.
-                                </p>
                                 </br>
                                 {% if unfollow_link %}
                                     <p>
@@ -42,4 +39,4 @@
             </div>
         </div>
     </body>
-</html>
+</html>
diff --git a/public_records_portal/templates/email_templates/email_closed_not_foil_request.html b/public_records_portal/templates/email_templates/email_closed_not_foil_request.html
@@ -23,9 +23,7 @@
                                     You can view the request and take any necessary action at the following webpage:
                                     <a href='{{ page }}'>{{ page }}</a>.
                                 </p>
-                                <p>
-                                    Click <a href="FAQ PAGE">here</a> to learn about how the City responds to FOIL requests.
-                                </p>
+
                                 </br>
                                 {% if unfollow_link %}
                                     <p>
@@ -42,4 +40,4 @@
             </div>
         </div>
     </body>
-</html>
+</html>
diff --git a/public_records_portal/templates/email_templates/email_closed_opendata.html b/public_records_portal/templates/email_templates/email_closed_opendata.html
@@ -24,9 +24,6 @@
                                     You can view the request and take any necessary action at the following webpage:
                                     <a href='{{ page }}'>{{ page }}</a>.
                                 </p>
-                                <p>
-                                    Click <a href="FAQ PAGE">here</a> to learn about how the City responds to FOIL requests.
-                                </p>
                                 </br>
                                 {% if unfollow_link %}
                                     <p>
@@ -43,4 +40,4 @@
             </div>
         </div>
     </body>
-</html>
+</html>
diff --git a/public_records_portal/templates/email_templates/email_closed_public_document.html b/public_records_portal/templates/email_templates/email_closed_public_document.html
@@ -23,9 +23,6 @@
                                     You can view the request and take any necessary action at the following webpage:
                                     <a href='{{ page }}'>{{ page }}</a>.
                                 </p>
-                                <p>
-                                    Click <a href="FAQ PAGE">here</a> to learn about how the City responds to FOIL requests.
-                                </p>
                                 </br>
                                 {% if unfollow_link %}
                                     <p>
@@ -42,4 +39,4 @@
             </div>
         </div>
     </body>
-</html>
+</html>
diff --git a/public_records_portal/templates/email_templates/email_closed_public_information.html b/public_records_portal/templates/email_templates/email_closed_public_information.html
@@ -24,9 +24,6 @@
                                     You can view the request and take any necessary action at the following webpage:
                                     <a href='{{ page }}'>{{ page }}</a>.
                                 </p>
-                                <p>
-                                    Click <a href="FAQ PAGE">here</a> to learn about how the City responds to FOIL requests.
-                                </p>
                                 </br>
                                 {% if unfollow_link %}
                                     <p>
@@ -43,4 +40,4 @@
             </div>
         </div>
     </body>
-</html>
+</html>