From b324526bd3df01e271eeef910a0d5e852ee3f69a Mon Sep 17 00:00:00 2001 From: Mike Olund Date: Fri, 24 Mar 2017 11:38:10 -0700 Subject: [PATCH 1/5] Updated local development documentation --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index df5be54a..1bdd30e6 100644 --- a/README.md +++ b/README.md @@ -22,17 +22,17 @@ To run this project in your development machine, follow these steps: 3. Install dependencies: - `pip install -r requirements.txt` + `pip3.5 install -r requirements.txt` 4. Create an environment settings file by copying `.env.example` to `.env` (`.env` will be ignored by Git) 5. Create a development database: - `./manage.py migrate` + `python3.5 ./manage.py migrate` 6. If everything is alright, you should be able to start the Django development server: - `./manage.py runserver 0.0.0.0:8000` + `python3.5 ./manage.py runserver 0.0.0.0:8000` 7. Start the [Weasyprint server](https://hub.docker.com/r/aquavitae/weasyprint/) server on port 5005 From e3fda8a82917510b77cde4afddb58270fd8a5556 Mon Sep 17 00:00:00 2001 From: Mike Olund Date: Fri, 24 Mar 2017 13:09:05 -0700 Subject: [PATCH 2/5] DIV-323 - remove the 'wait' spinner when the back button is pressed --- edivorce/apps/core/static/js/main.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/edivorce/apps/core/static/js/main.js b/edivorce/apps/core/static/js/main.js index 0fa3a6cb..7b9001ad 100755 --- a/edivorce/apps/core/static/js/main.js +++ b/edivorce/apps/core/static/js/main.js @@ -190,4 +190,7 @@ $("a.more_information-close").click(function () { $(".question-well").click(function () { $(".question-well").removeClass('hasFocus'); $(this).addClass('hasFocus'); -}); \ No newline at end of file +}); + +// kills the spinner when the back button is pressed +window.onunload = function () { }; From 463d299d15a5ca8dd5f3d5907621a221181f9565 Mon Sep 17 00:00:00 2001 From: Mike Olund Date: Fri, 24 Mar 2017 13:31:31 -0700 Subject: [PATCH 3/5] DIV-200 - Preview form should open in the same tab. --- edivorce/apps/core/static/js/main.js | 5 +++++ .../apps/core/templates/dashboard/print_form.html | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/edivorce/apps/core/static/js/main.js b/edivorce/apps/core/static/js/main.js index 7b9001ad..0fb1ff98 100755 --- a/edivorce/apps/core/static/js/main.js +++ b/edivorce/apps/core/static/js/main.js @@ -192,5 +192,10 @@ $(".question-well").click(function () { $(this).addClass('hasFocus'); }); +// disable collapse for links in data-toggle elements +$('.no-collapse').on('click', function (e) { + e.stopPropagation(); +}); + // kills the spinner when the back button is pressed window.onunload = function () { }; diff --git a/edivorce/apps/core/templates/dashboard/print_form.html b/edivorce/apps/core/templates/dashboard/print_form.html index f91e7834..2f8a950d 100644 --- a/edivorce/apps/core/templates/dashboard/print_form.html +++ b/edivorce/apps/core/templates/dashboard/print_form.html @@ -23,7 +23,7 @@
Notice of Joint Family Claim Form (F1)
-

Preview |

+

Preview |

@@ -37,7 +37,7 @@
Requisition Form (F35)
-

Preview |

+

Preview |

@@ -51,7 +51,7 @@
Draft Final Order Form (F52)
-

Preview |

+

Preview |

@@ -71,7 +71,7 @@
Certificate of Pleadings Form (F36)
-

Preview |

+

Preview |

@@ -91,7 +91,7 @@
Affidavit Desk Order Divorce Form (F38) - signing together
-

Preview |

+

Preview |

@@ -119,11 +119,11 @@

Claimant 1

- Preview | + Preview |

Claimant 2

- Preview | + Preview |
From 8736f0c8b52d5685f0d3f85e50408df03984fd9f Mon Sep 17 00:00:00 2001 From: Mike Olund Date: Fri, 24 Mar 2017 13:44:14 -0700 Subject: [PATCH 4/5] DIV-395 - Fixed YSOD error --- edivorce/apps/core/templatetags/input_field.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edivorce/apps/core/templatetags/input_field.py b/edivorce/apps/core/templatetags/input_field.py index 989eaad3..d48a8a3e 100644 --- a/edivorce/apps/core/templatetags/input_field.py +++ b/edivorce/apps/core/templatetags/input_field.py @@ -23,7 +23,7 @@ def input_field(context, type, name='', value='', multiple='', **kwargs): # set initial value for textbox if type == "text" and value == '' and multiple != 'true': value = context.get(name, '') - tag = [' Date: Fri, 24 Mar 2017 14:26:50 -0700 Subject: [PATCH 5/5] DIV-203 - prompt user when invalid date range is entered in reconciliation date fields --- edivorce/apps/core/static/js/controllers.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/edivorce/apps/core/static/js/controllers.js b/edivorce/apps/core/static/js/controllers.js index bd72c4f0..160795ed 100644 --- a/edivorce/apps/core/static/js/controllers.js +++ b/edivorce/apps/core/static/js/controllers.js @@ -133,6 +133,12 @@ var getValue = function(el, question){ // check if both date is in valid format and all if (sToDate != '' && sFromDate != '' && isValidDate(sToDate) && isValidDate(sFromDate)) { + // clear previous errors + el.closest('.form-group') + .removeClass('has-error') + .find('span.help-block') + .remove(); + dToDate = stringToDate(sToDate); dFromDate = stringToDate(sFromDate); if (dFromDate < dToDate){ @@ -147,8 +153,9 @@ var getValue = function(el, question){ } } else { - console.log(sFromDate + " : " + sToDate); - console.log("From date must be smaller than To date") + el.closest('.date') + .addClass('has-error') + .append('Negative Date Range'); } } else {