#1050 UI:Change behaviour of address field in signup admin page #1098

PrernaSingh587 · 2020-09-08T09:13:50Z

Description

In Sign Up Admin, I have made the city and state input disabled until the country is filled first. The city is disabled until the state is filled first.

Fixes #1050

Type of Change:

User Interface

How Has This Been Tested?

Checked in my local server. Works well according to me. I have handled all the scenarios.

Checklist:

My PR follows the style guidelines of this project
I have performed a self-review of my own code or materials
I have commented my code.

…lled up Handled All Scenarios

rkpattnaik780

I guess this code has some unnecessary checks and can be improved. We can achieve the change in fewer lines of code. Furthermore, these changes dont seem to work properly

rkpattnaik780 · 2020-09-09T07:26:55Z

vms/vms/static/vms/js/load_city.js

 $(document).ready(function() {
    $("#select_state").change(function() {
+/* Disables the city input field until the state input is filled up */
+	function hideCity(){
+		var state =document.getElementById("select_state");


If we have jquery already, use $ instead of document.getElementBy-.

rkpattnaik780 · 2020-09-09T07:27:29Z

vms/vms/static/vms/js/load_state.js

 });

+


Remove these extra lines.

PrernaSingh587 · 2020-09-09T09:14:56Z

I guess this code has some unnecessary checks and can be improved. We can achieve the change in fewer lines of code. Furthermore, these changes dont seem to work properly

Alright , I Will make the required modification. Could you tell me what is not working properly with these changes? Do I need to put some more to the code apart from changing it to jQuery?

rkpattnaik780 · 2020-09-09T09:28:23Z

I guess this code has some unnecessary checks and can be improved. We can achieve the change in fewer lines of code. Furthermore, these changes dont seem to work properly

Alright , I Will make the required modification. Could you tell me what is not working properly with these changes? Do I need to put some more to the code apart from changing it to jQuery?

Initially the state and city dropdowns are not disabled.

PrernaSingh587 · 2020-09-11T09:27:11Z

I guess this code has some unnecessary checks and can be improved. We can achieve the change in fewer lines of code. Furthermore, these changes dont seem to work properly

Alright , I Will make the required modification. Could you tell me what is not working properly with these changes? Do I need to put some more to the code apart from changing it to jQuery?

Initially the state and city dropdowns are not disabled.

As per the GIF, it is happening in mine.

rkpattnaik780 · 2020-09-11T10:29:10Z

I guess this code has some unnecessary checks and can be improved. We can achieve the change in fewer lines of code. Furthermore, these changes dont seem to work properly

Alright , I Will make the required modification. Could you tell me what is not working properly with these changes? Do I need to put some more to the code apart from changing it to jQuery?

Initially the state and city dropdowns are not disabled.

As per the GIF, it is happening in mine.

It is rather weird, if I run the app and navigate to admin signup through homepage, the dropdowns are not disbled by default. Can you show me a gif showing the dropdowns just after navigating t that page?

PrernaSingh587 · 2020-09-13T03:23:25Z

I guess this code has some unnecessary checks and can be improved. We can achieve the change in fewer lines of code. Furthermore, these changes dont seem to work properly

Alright , I Will make the required modification. Could you tell me what is not working properly with these changes? Do I need to put some more to the code apart from changing it to jQuery?

Initially the state and city dropdowns are not disabled.

As per the GIF, it is happening in mine.

It is rather weird, if I run the app and navigate to admin signup through homepage, the dropdowns are not disbled by default. Can you show me a gif showing the dropdowns just after navigating t that page?

. . . .
@rkpattnaik780
Hello.
Sorry for the delay in responding.

rkpattnaik780 · 2020-09-13T07:52:17Z

Hello @psingh587 . Can you please check if all your commits have been pushed cause I am not able to see it locally after pulling your PR. Furthermore, do address the other review comments, give appropriate spacing link x = a and not x =a. Squash your commits as well.

rkpattnaik780 · 2020-09-15T07:46:35Z

@psingh587 any update?

PrernaSingh587 · 2020-09-15T16:24:34Z

@psingh587 any update?

Really sorry for the delay. There were some technical issues with my laptop. I will work upon this commit tonight and get back to you.

City Input gets disabled if previous inputs are not filled up.

PrernaSingh587 · 2020-09-16T05:31:53Z

@rkpattnaik780
I have made the file changes. It handles all the scenarios. Please check.

codecov · 2020-09-16T05:38:16Z

Codecov Report

❗ No coverage uploaded for pull request base (develop@b58bc98). Click here to learn what that means.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             develop    #1098   +/-   ##
==========================================
  Coverage           ?   86.93%           
==========================================
  Files              ?       85           
  Lines              ?     4057           
  Branches           ?      237           
==========================================
  Hits               ?     3527           
  Misses             ?      458           
  Partials           ?       72

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b58bc98...b44ce93. Read the comment docs.

rkpattnaik780

Thanks for these changes. It handles all the scenarios. Please make this PR cleaner, there are many unnecessary log statements that need to be removed and please indent properly. You are also required to squash your commits.

rkpattnaik780 · 2020-09-16T19:10:33Z

vms/registration/templates/registration/signup_administrator.html

@@ -226,18 +225,19 @@ <h2 class="header">{% trans "Sign Up" %}</h2>
                        {% endfor %}
                    </select>
            </div>
+


Remove this unnecessary blank line.

rkpattnaik780 · 2020-09-16T19:10:38Z

vms/vms/static/vms/js/load_city.js

+	function hideCity(){
+		var country = $("#select_country");
+    		var state = $("#select_state");
+		var city = $("#select_city"); if(state.prop('disabled') === false) console.log("yessss",state.val())


Place this if statement in a proper position.

rkpattnaik780 · 2020-09-16T19:11:01Z

vms/vms/static/vms/js/load_city.js

+	function hideCity(){
+		var country = $("#select_country");
+    		var state = $("#select_state");
+		var city = $("#select_city"); if(state.prop('disabled') === false) console.log("yessss",state.val())


Remove console log as well.

rkpattnaik780 · 2020-09-16T19:11:45Z

vms/vms/static/vms/js/load_city.js

+		var country = $("#select_country");
+    		var state = $("#select_state");
+		var city = $("#select_city"); if(state.prop('disabled') === false) console.log("yessss",state.val())
+		if(state.prop('disabled') === false && state.val() !== null && state.val() !== "0") { console.log("ji")


Remove console log

rkpattnaik780 · 2020-09-16T19:12:19Z

vms/vms/static/vms/js/load_state.js

 $(document).ready(function() {
    $("#select_country").change(function() {
+console.log("hi")


Remove console.log

rkpattnaik780 · 2020-09-16T19:12:54Z

vms/vms/static/vms/js/load_state.js

+			city.prop("disabled", true);
+			city.val("");
+		}
+ console.log(state.val())


Remove console.log

rkpattnaik780 · 2020-09-16T19:13:11Z

vms/vms/static/vms/js/load_state.js

+    				var state = $("#select_state");
+				var city = $("#select_city");
+				if(state.val() !== "0" && state.val() !== null &&state.prop('disabled') === false) {
+               				city.html(cities);


Fix the indentation here.

rkpattnaik780 · 2020-09-16T19:13:25Z

vms/vms/static/vms/js/load_state.js

                        }
                    });
                }
            }
-        });
+        }); 


Remove this extra space.

Removed unnecessary logs.

Removed extra logs and white spaces

rkpattnaik780 · 2020-09-18T12:51:37Z

vms/vms/static/vms/js/load_city.js

+            success: function(cities) { 
+		var state = $("#select_state");
+		var city = $("#select_city");
+		if(state.val() !== "0" && state.val()!==null && state.prop('disabled') === false) {


Fix the indentation of this if/else block, we shouldn't have two tabs here. Sqaush the commits as well. In many places two tabs have been provided instead of one, please take care of that.

PrernaSingh587 · 2020-09-21T17:55:07Z

Hey!
I have raised another PR and closing this one. The commits here went a bit bogus and I was not able to squash them.
#1124

PrernaSingh587 added 3 commits September 8, 2020 14:26

Disables the city input field until the state input is filled up

82227f4

Disables the city and state input field until the country input is fi…

6ade48b

…lled up Handled All Scenarios

Updated

0c628b5

PrernaSingh587 changed the title ~~New input~~ #1050 UI:Change behaviour of address field in signup admin page Sep 8, 2020

rkpattnaik780 suggested changes Sep 9, 2020

View reviewed changes

PrernaSingh587 added 5 commits September 16, 2020 10:48

Fix: City input will get disabled if previous inputs arent filled.

8eedcec

Fix: Removed Extra Lines.

734d25b

City Input gets disabled if previous inputs are not filled up.

Fix: State input will disabled until prev inputs filled

a006749

Fix: Added disabled attr to city and state.

885d9cb

Removed Extra whitespaces.

1fa67d8

rkpattnaik780 suggested changes Sep 16, 2020

View reviewed changes

PrernaSingh587 added 5 commits September 17, 2020 19:14

Fix: City Input modified

3568fc0

Removed unnecessary logs.

Fix: State input modified.

d2e0da1

Removed extra logs and white spaces

Updated

70d365f

Update

6afb92f

Removed white spaces

9f2e9a6

rkpattnaik780 reviewed Sep 18, 2020

View reviewed changes

Updated the Indentation

b44ce93

PrernaSingh587 closed this Sep 21, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#1050 UI:Change behaviour of address field in signup admin page #1098

#1050 UI:Change behaviour of address field in signup admin page #1098

PrernaSingh587 commented Sep 8, 2020 •

edited

Loading

rkpattnaik780 left a comment

rkpattnaik780 Sep 9, 2020

rkpattnaik780 Sep 9, 2020

PrernaSingh587 commented Sep 9, 2020

rkpattnaik780 commented Sep 9, 2020

PrernaSingh587 commented Sep 11, 2020

rkpattnaik780 commented Sep 11, 2020

PrernaSingh587 commented Sep 13, 2020 •

edited

Loading

rkpattnaik780 commented Sep 13, 2020

rkpattnaik780 commented Sep 15, 2020

PrernaSingh587 commented Sep 15, 2020

PrernaSingh587 commented Sep 16, 2020

codecov bot commented Sep 16, 2020 •

edited

Loading

rkpattnaik780 left a comment

rkpattnaik780 Sep 16, 2020

rkpattnaik780 Sep 16, 2020

rkpattnaik780 Sep 16, 2020

rkpattnaik780 Sep 16, 2020

rkpattnaik780 Sep 16, 2020

rkpattnaik780 Sep 16, 2020

rkpattnaik780 Sep 16, 2020

rkpattnaik780 Sep 16, 2020

rkpattnaik780 Sep 18, 2020 •

edited

Loading

PrernaSingh587 commented Sep 21, 2020

#1050 UI:Change behaviour of address field in signup admin page #1098

#1050 UI:Change behaviour of address field in signup admin page #1098

Conversation

PrernaSingh587 commented Sep 8, 2020 • edited Loading

Description

Type of Change:

How Has This Been Tested?

Checklist:

rkpattnaik780 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

PrernaSingh587 commented Sep 9, 2020

rkpattnaik780 commented Sep 9, 2020

PrernaSingh587 commented Sep 11, 2020

rkpattnaik780 commented Sep 11, 2020

PrernaSingh587 commented Sep 13, 2020 • edited Loading

rkpattnaik780 commented Sep 13, 2020

rkpattnaik780 commented Sep 15, 2020

PrernaSingh587 commented Sep 15, 2020

PrernaSingh587 commented Sep 16, 2020

codecov bot commented Sep 16, 2020 • edited Loading

Codecov Report

rkpattnaik780 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rkpattnaik780 Sep 18, 2020 • edited Loading

Choose a reason for hiding this comment

PrernaSingh587 commented Sep 21, 2020

PrernaSingh587 commented Sep 8, 2020 •

edited

Loading

PrernaSingh587 commented Sep 13, 2020 •

edited

Loading

codecov bot commented Sep 16, 2020 •

edited

Loading

rkpattnaik780 Sep 18, 2020 •

edited

Loading