Commit b5820950 by Simeon Markind

Formatting sucks but functionality should be done

parent 4965b9d9
...@@ -20,7 +20,9 @@ import com.example.dynamicduals2.jigs.statusCount; ...@@ -20,7 +20,9 @@ import com.example.dynamicduals2.jigs.statusCount;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
//simeon comment 2 //simeon comment 2
public class MainActivity extends AppCompatActivity { public class MainActivity extends AppCompatActivity {
...@@ -35,6 +37,7 @@ public class MainActivity extends AppCompatActivity { ...@@ -35,6 +37,7 @@ public class MainActivity extends AppCompatActivity {
private EditText mWard; private EditText mWard;
private Gson gson; private Gson gson;
private TextView mWardInfo;
private TextView mSR_TYPE0; private TextView mSR_TYPE0;
private TextView mC_0; private TextView mC_0;
private TextView mSR_TYPE1; private TextView mSR_TYPE1;
...@@ -45,15 +48,20 @@ public class MainActivity extends AppCompatActivity { ...@@ -45,15 +48,20 @@ public class MainActivity extends AppCompatActivity {
private TextView mBacklogOpenTxt; private TextView mBacklogOpenTxt;
private TextView mClosedTxt; private TextView mClosedTxt;
private RequestQueue mQueue; private RequestQueue mQueue;
private Map<Integer, String> wardAlderman;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main); setContentView(R.layout.activity_main);
wardAlderman = new HashMap<Integer, String>();
populateWardAlderman();
mQueue = Volley.newRequestQueue(this); mQueue = Volley.newRequestQueue(this);
gson = new Gson(); gson = new Gson();
mWardInfo = findViewById(R.id.wardInfoTxt);
mBtnTop3 = findViewById(R.id.btnTop3Complaints); mBtnTop3 = findViewById(R.id.btnTop3Complaints);
mWard = findViewById(R.id.ward); mWard = findViewById(R.id.ward);
...@@ -78,6 +86,9 @@ public class MainActivity extends AppCompatActivity { ...@@ -78,6 +86,9 @@ public class MainActivity extends AppCompatActivity {
Toast.makeText(getApplicationContext(), Toast.makeText(getApplicationContext(),
"Invalid Ward Number", Toast.LENGTH_SHORT).show(); "Invalid Ward Number", Toast.LENGTH_SHORT).show();
} else { } else {
mWardInfo.setText(getWardInfo(wardInt));
String url = createURL(mWard.getText().toString()); String url = createURL(mWard.getText().toString());
fetchTop3(url); fetchTop3(url);
...@@ -95,6 +106,15 @@ public class MainActivity extends AppCompatActivity { ...@@ -95,6 +106,15 @@ public class MainActivity extends AppCompatActivity {
}); });
} }
private String getWardInfo(Integer ward){
StringBuilder out = new StringBuilder("Ward ");
out.append(ward);
out.append(" is served by ");
out.append(wardAlderman.get(ward));
return out.toString();
}
private String createURL(String ward) { private String createURL(String ward) {
StringBuilder out = new StringBuilder(BASE_URL); StringBuilder out = new StringBuilder(BASE_URL);
out.append("?$query=SELECT sr_type, COUNT(*) AS C WHERE ward == "); out.append("?$query=SELECT sr_type, COUNT(*) AS C WHERE ward == ");
...@@ -243,4 +263,57 @@ public class MainActivity extends AppCompatActivity { ...@@ -243,4 +263,57 @@ public class MainActivity extends AppCompatActivity {
} }
}; };
private void populateWardAlderman(){
wardAlderman.put(1, "Daniel La Spata");
wardAlderman.put(2, "Brian Hopkins");
wardAlderman.put(3, "Pat Dowell");
wardAlderman.put(4, "Sophia King");
wardAlderman.put(5, "Leslie Hairston");
wardAlderman.put(6, "Roderick Sawyer");
wardAlderman.put(7, "Gregory Mitchell");
wardAlderman.put(8, "Michelle Harris");
wardAlderman.put(9, "Anthony Beale");
wardAlderman.put(10, "Susan Sadlowski Garza");
wardAlderman.put(11, "Patrick Thompson");
wardAlderman.put(12, "George A. Cardenas");
wardAlderman.put(13, "Marty Quinn");
wardAlderman.put(14, "Ed Burke");
wardAlderman.put(15, "Raymond Lopez");
wardAlderman.put(16, "Stephanie D. Coleman");
wardAlderman.put(17, "David Moore");
wardAlderman.put(18, "Derrick Curtis");
wardAlderman.put(19, "Matthew O’Shea");
wardAlderman.put(20, "Jeanette B. Taylor");
wardAlderman.put(21, "Howard Brookins Jr.");
wardAlderman.put(22, "Michael D. Rodriguez");
wardAlderman.put(23, "Silvana Tabares");
wardAlderman.put(24, "Michael Scott Jr.");
wardAlderman.put(25, "Byron Sigcho Lopez");
wardAlderman.put(26, "Roberto Maldonado");
wardAlderman.put(27, "Walter Burnett, Jr.");
wardAlderman.put(28, "Jason Ervin");
wardAlderman.put(29, "Chris Taliaferro");
wardAlderman.put(30, "Ariel E. Reboyras");
wardAlderman.put(31, "Felix Cardona, Jr.");
wardAlderman.put(32, "Scott Waguespack");
wardAlderman.put(33, "Rossana Rodriguez Sanchez");
wardAlderman.put(34, "Carrie Austin");
wardAlderman.put(35, "Carlos Ramirez-Rosa");
wardAlderman.put(36, "Gilbert Villegas");
wardAlderman.put(37, "Emma Mitts");
wardAlderman.put(38, "Nicholas Sposato");
wardAlderman.put(39, "Samantha Nugent");
wardAlderman.put(40, "Andre Vasquez, Jr.");
wardAlderman.put(41, "Anthony Napolitano");
wardAlderman.put(42, "Brendan Reilly");
wardAlderman.put(43, "Michele Smith");
wardAlderman.put(44, "Thomas M. Tunney");
wardAlderman.put(45, "James M. Gardiner");
wardAlderman.put(46, "James Cappleman");
wardAlderman.put(47, "Matthew J. Martin");
wardAlderman.put(48, "Harry Osterman");
wardAlderman.put(49, "Maria E. Hadden");
wardAlderman.put(50, "Debra Silverstein");
}
} }
\ No newline at end of file
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="25dp" android:layout_height="30dp"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_weight="15" android:layout_weight="10"
android:orientation="horizontal" android:orientation="horizontal"
android:weightSum="100"> android:weightSum="100">
...@@ -29,6 +29,14 @@ ...@@ -29,6 +29,14 @@
</LinearLayout> </LinearLayout>
<TextView
android:id="@+id/wardInfoTxt"
android:layout_width="match_parent"
android:layout_height="20dp"
android:layout_weight="10"
android:paddingLeft="5dp"
android:textSize="15dp" />
<Button <Button
android:id="@+id/btnTop3Complaints" android:id="@+id/btnTop3Complaints"
android:layout_width="100dp" android:layout_width="100dp"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment