From 4b0ef6086ab9ee3c06e31c76138fe9d36cbe6dac Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 3 Sep 2014 15:58:18 -0400
Subject: [PATCH] Cleanup contact and list viewers

---
 UI/Contacts/UIxContactView.m | 78 ------------------------------------
 UI/Contacts/UIxListView.m    |  5 +--
 2 files changed, 2 insertions(+), 81 deletions(-)

diff --git a/UI/Contacts/UIxContactView.m b/UI/Contacts/UIxContactView.m
index 9fe4ebb95..871adb081 100644
--- a/UI/Contacts/UIxContactView.m
+++ b/UI/Contacts/UIxContactView.m
@@ -280,15 +280,6 @@
   return @"";
 }
 
-// - (NSString *) categories
-// {
-//   NSString *categories;
-
-//   categories = [[card categories] componentsJoinedByString: @", "];
-//   return [self _cardStringWithLabel: @"Categories:"
-//                value: categories];
-// }
-
 - (BOOL) hasTelephones
 {
   if (!phones)
@@ -647,66 +638,6 @@
   return [self _cardStringWithLabel: nil value: services];
 }
 
-- (NSString *) workCompany
-{
-  return [self _cardStringWithLabel: nil value: [card workCompany]];
-}
-
-- (NSString *) workPobox
-{
-  return [self _cardStringWithLabel: nil
-                              value: [workAdr flattenedValueAtIndex: 0
-                                                             forKey: @""]];
-}
-
-- (NSString *) workExtendedAddress
-{
-  return [self _cardStringWithLabel: nil
-                              value: [workAdr flattenedValueAtIndex: 1
-                                                             forKey: @""]];
-}
-
-- (NSString *) workStreetAddress
-{
-  return [self _cardStringWithLabel: nil
-                              value: [workAdr flattenedValueAtIndex: 2
-                                                             forKey: @""]];
-}
-
-- (NSString *) workCityAndProv
-{
-  NSString *city, *prov;
-  NSMutableString *data;
-
-  city = [workAdr flattenedValueAtIndex: 3 forKey: @""];
-  prov = [workAdr flattenedValueAtIndex: 4 forKey: @""];
-
-  data = [NSMutableString string];
-  [data appendString: city];
-  if ([city length] > 0 && [prov length] > 0)
-    [data appendString: @" "];
-  [data appendString: prov];
-
-  return [self _cardStringWithLabel: nil value: data];
-}
-
-- (NSString *) workPostalCodeAndCountry
-{
-  NSString *postalCode, *country;
-  NSMutableString *data;
-
-  postalCode = [workAdr flattenedValueAtIndex: 5 forKey: @""];
-  country = [workAdr flattenedValueAtIndex: 6 forKey: @""];
-
-  data = [NSMutableString string];
-  [data appendString: postalCode];
-  if ([postalCode length] > 0 && [country length] > 0)
-    [data appendFormat: @" ", country];
-  [data appendString: country];
-
-  return [self _cardStringWithLabel: nil value: data];
-}
-
 - (NSString *) workUrl
 {
   return [self _urlOfType: @"work"];
@@ -811,7 +742,6 @@
   id <WOActionResults> result;
   id o;
   SOGoObject <SOGoContactObject> *contact;
-  // NSMutableArray *description;
   NSMutableDictionary *data;
 
   contact = [self clientObject];
@@ -828,7 +758,6 @@
     return [NSException exceptionWithHTTPStatus: 404 /* Not Found */
                                          reason: @"could not locate contact"];
 
-  // description = [NSMutableArray array];
   data = [NSMutableDictionary dictionaryWithObjectsAndKeys:
                                 [[contact container] nameInContainer], @"pid",
                               [contact nameInContainer], @"id",
@@ -848,33 +777,26 @@
     }
   o = [card nickname];
   if (o) [data setObject: o forKey: @"nickname"];
-  // o = [card fullName];
-  // if (o) [data setObject: o forKey: @"fullname"];
   o = [card title];
   if ([o length] > 0)
     {
       [data setObject: o forKey: @"title"];
-      // [description addObject: o];
     }
   o = [card role];
   if ([o length] > 0)
     {
       [data setObject: o forKey: @"role"];
-      // [description addObject: o];
     }
   o = [self orgUnits];
   if ([o count] > 0)
     {
       [data setObject: o forKey: @"orgUnits"];
-      // [description addObjectsFromArray: o];
     }
   o = [card workCompany];
   if ([o length] > 0)
     {
       [data setObject: o forKey: @"org"];
-      // [description addObject: o];
     }
-  // if ([description count]) [data setObject: description forKey: @"description"];
 
   o = [card birthday];
   if (o)
diff --git a/UI/Contacts/UIxListView.m b/UI/Contacts/UIxListView.m
index 953b35ab2..64cc3ceb4 100644
--- a/UI/Contacts/UIxListView.m
+++ b/UI/Contacts/UIxListView.m
@@ -174,14 +174,13 @@
   data = [NSMutableDictionary dictionaryWithObjectsAndKeys:
                                 [[co container] nameInContainer], @"pid",
                               [co nameInContainer], @"id",
-                              [list tag], @"tag",
+                              [[list tag] lowercaseString], @"tag",
                               [list fn], @"fn",
+                              [list nickname], @"nickname",
                               [list description], @"description",
                               cards, @"refs",
                               nil];
 
-  // [list cardReferences]
-
   result = [self responseWithStatus: 200
                           andString: [data jsonRepresentation]];