Sprint 30 (#493)

* Resolves #357 * Resolves #474
DiscipleTools · Nov 10, 2020 · f4916ba · f4916ba
1 parent 4c52a14
commit f4916ba
Show file tree

Hide file tree

Showing 24 changed files with 454 additions and 238 deletions.
diff --git a/components/SearchBar.js b/components/SearchBar.js
@@ -195,9 +195,7 @@ class SearchBar extends React.Component {
   };
 
   renderSectionContent = (section, index, isActive, sections) => {
-    let content = this.props.filterConfig.filters.filter(
-      (filter) => filter.tab === section.key && !filter.type,
-    );
+    let content = this.props.filterConfig.filters.filter((filter) => filter.tab === section.key);
     return (
       <View
         key={index}
@@ -206,45 +204,49 @@ class SearchBar extends React.Component {
           borderColor: Colors.grayLight,
           padding: 15,
         }}>
-        {content.map((filter) => (
-          <TouchableOpacity
-            key={filter.ID}
-            activeOpacity={0.5}
-            onPress={() => {
-              this.filterByOption(filter.ID, filter.query, filter.name);
-            }}>
-            <View
-              style={{
-                flexDirection: 'row',
-                height: 50,
-                paddingLeft: filter.subfilter ? 20 : 0,
+        {content.length > 0 ? (
+          content.map((filter) => (
+            <TouchableOpacity
+              key={filter.ID}
+              activeOpacity={0.5}
+              onPress={() => {
+                this.filterByOption(filter.ID, filter.query, filter.name);
               }}>
-              <CheckBox
-                Component={TouchableWithoutFeedback}
-                checked={filter.ID === this.state.filter.ID}
-                checkedIcon="dot-circle-o"
-                uncheckedIcon="circle-o"
-                containerStyle={{
-                  padding: 0,
-                  margin: 0,
-                }}
-              />
-              <Text
+              <View
                 style={{
-                  paddingTop: Platform.OS === 'ios' ? 4 : 0,
+                  flexDirection: 'row',
+                  height: 50,
+                  paddingLeft: filter.subfilter ? 20 : 0,
                 }}>
-                {filter.name}
-              </Text>
-              <Text
-                style={{
-                  marginLeft: 'auto',
-                  paddingTop: Platform.OS === 'ios' ? 4 : 0,
-                }}>
-                {filter.count}
-              </Text>
-            </View>
-          </TouchableOpacity>
-        ))}
+                <CheckBox
+                  Component={TouchableWithoutFeedback}
+                  checked={filter.ID === this.state.filter.ID}
+                  checkedIcon="dot-circle-o"
+                  uncheckedIcon="circle-o"
+                  containerStyle={{
+                    padding: 0,
+                    margin: 0,
+                  }}
+                />
+                <Text
+                  style={{
+                    paddingTop: Platform.OS === 'ios' ? 4 : 0,
+                  }}>
+                  {filter.name}
+                </Text>
+                <Text
+                  style={{
+                    marginLeft: 'auto',
+                    paddingTop: Platform.OS === 'ios' ? 4 : 0,
+                  }}>
+                  {filter.count}
+                </Text>
+              </View>
+            </TouchableOpacity>
+          ))
+        ) : (
+          <Text>{i18n.t('global.noFilters')}</Text>
+        )}
       </View>
     );
   };

diff --git a/languages/ar.json b/languages/ar.json
@@ -38,7 +38,8 @@
     "submit": "إرسال",
     "share": "",
     "shareSettings": "",
-    "searchUsers": ""
+    "searchUsers": "",
+    "noFilters": ""
   },
   "loginScreen": {
     "domain": {
@@ -89,7 +90,8 @@
     "incorrectPin": "رقم التعريف الشخصي غير صحيح",
     "savedPinCode": "تم حفظ رمز PIN بنجاح",
     "removedPinCode": "تمت إزالة رمز PIN بنجاح",
-    "close": "قريب"
+    "close": "قريب",
+    "confirmPin": ""
   },
   "contactDetailScreen": {
     "addNewContact": "إضافة جهة اتصال جديدة",

diff --git a/languages/bn.json b/languages/bn.json
@@ -38,7 +38,8 @@
     "submit": "",
     "share": "",
     "shareSettings": "",
-    "searchUsers": ""
+    "searchUsers": "",
+    "noFilters": ""
   },
   "loginScreen": {
     "domain": {
@@ -89,7 +90,8 @@
     "incorrectPin": "ভুল পিন",
     "savedPinCode": "পিন কোড সাফল্যের সাথে সংরক্ষিত হয়েছে",
     "removedPinCode": "পিন কোড সফলভাবে সরানো হয়েছে",
-    "close": "বন্ধ"
+    "close": "বন্ধ",
+    "confirmPin": ""
   },
   "contactDetailScreen": {
     "addNewContact": "নতুন পরিচিতি যোগ করুন",

diff --git a/languages/en.json b/languages/en.json
@@ -38,7 +38,8 @@
     "submit": "Submit",
     "share": "Share",
     "shareSettings": "Share settings",
-    "searchUsers": "Search Users"
+    "searchUsers": "Search Users",
+    "noFilters": "No filters"
   },
   "loginScreen": {
     "domain": {
@@ -89,7 +90,8 @@
     "incorrectPin": "Incorrect PIN",
     "savedPinCode": "PIN code saved successfully!.",
     "removedPinCode": "PIN code removed successfully!.",
-    "close": "Close"
+    "close": "Close",
+    "confirmPin": "Confirm the new PIN"
   },
   "contactDetailScreen": {
     "addNewContact": "Add New Contact",

diff --git a/languages/es.json b/languages/es.json
@@ -38,7 +38,8 @@
     "submit": "Enviar",
     "share": "Compartir",
     "shareSettings": "Compartir Configuraciones",
-    "searchUsers": "Buscar usuarios"
+    "searchUsers": "Buscar usuarios",
+    "noFilters": "No hay filtros"
   },
   "loginScreen": {
     "domain": {
@@ -89,7 +90,8 @@
     "incorrectPin": "PIN incorrecto",
     "savedPinCode": "El código PIN se ha guardado correctamente!.",
     "removedPinCode": "El código PIN se ha removido correctamente!.",
-    "close": "Cerrar"
+    "close": "Cerrar",
+    "confirmPin": "Confirme el nuevo PIN"
   },
   "contactDetailScreen": {
     "addNewContact": "Crear contacto",

diff --git a/languages/fa.json b/languages/fa.json
@@ -38,7 +38,8 @@
     "submit": "",
     "share": "",
     "shareSettings": "",
-    "searchUsers": ""
+    "searchUsers": "",
+    "noFilters": ""
   },
   "loginScreen": {
     "domain": {
@@ -89,7 +90,8 @@
     "incorrectPin": "پین نادرست",
     "savedPinCode": "کد پین با موفقیت ذخیره شد",
     "removedPinCode": "کد پین با موفقیت حذف شد",
-    "close": "نزدیک"
+    "close": "نزدیک",
+    "confirmPin": ""
   },
   "contactDetailScreen": {
     "addNewContact": "مخاطب جدید اضافه کنید",

diff --git a/languages/fr.json b/languages/fr.json
@@ -38,7 +38,8 @@
     "submit": "",
     "share": "",
     "shareSettings": "",
-    "searchUsers": ""
+    "searchUsers": "",
+    "noFilters": ""
   },
   "loginScreen": {
     "domain": {
@@ -89,7 +90,8 @@
     "incorrectPin": "PIN incorrect",
     "savedPinCode": "Code PIN enregistré avec succès",
     "removedPinCode": "Code PIN supprimé avec succès",
-    "close": "Fermer"
+    "close": "Fermer",
+    "confirmPin": ""
   },
   "contactDetailScreen": {
     "addNewContact": "Ajouter un nouveau contact",

diff --git a/languages/hr.json b/languages/hr.json
@@ -38,7 +38,8 @@
     "submit": "",
     "share": "",
     "shareSettings": "",
-    "searchUsers": ""
+    "searchUsers": "",
+    "noFilters": ""
   },
   "loginScreen": {
     "domain": {
@@ -89,7 +90,8 @@
     "incorrectPin": "Neispravan PIN",
     "savedPinCode": "PIN kod je uspješno spremljen",
     "removedPinCode": "PIN kod je uspješno uklonjen",
-    "close": "Zatvoriti"
+    "close": "Zatvoriti",
+    "confirmPin": ""
   },
   "contactDetailScreen": {
     "addNewContact": "Dodaj novi kontakt",

diff --git a/languages/id.json b/languages/id.json
@@ -38,7 +38,8 @@
     "submit": "",
     "share": "",
     "shareSettings": "",
-    "searchUsers": ""
+    "searchUsers": "",
+    "noFilters": ""
   },
   "loginScreen": {
     "domain": {
@@ -89,7 +90,8 @@
     "incorrectPin": "PIN salah",
     "savedPinCode": "Kode PIN berhasil disimpan",
     "removedPinCode": "Kode PIN berhasil dihapus",
-    "close": "Menutup"
+    "close": "Menutup",
+    "confirmPin": ""
   },
   "contactDetailScreen": {
     "addNewContact": "Tambahkan Kontak Baru",

diff --git a/languages/nl.json b/languages/nl.json
@@ -38,7 +38,8 @@
     "submit": "",
     "share": "",
     "shareSettings": "",
-    "searchUsers": ""
+    "searchUsers": "",
+    "noFilters": ""
   },
   "loginScreen": {
     "domain": {
@@ -89,7 +90,8 @@
     "incorrectPin": "Onjuiste pincode",
     "savedPinCode": "PIN-code succesvol opgeslagen",
     "removedPinCode": "PIN-code succesvol verwijderd",
-    "close": "Dichtbij"
+    "close": "Dichtbij",
+    "confirmPin": ""
   },
   "contactDetailScreen": {
     "addNewContact": "Voeg nieuw contact toe",

diff --git a/languages/pt.json b/languages/pt.json
@@ -38,7 +38,8 @@
     "submit": "",
     "share": "",
     "shareSettings": "",
-    "searchUsers": ""
+    "searchUsers": "",
+    "noFilters": ""
   },
   "loginScreen": {
     "domain": {
@@ -89,7 +90,8 @@
     "incorrectPin": "PIN incorreto",
     "savedPinCode": "Código PIN salvo com sucesso",
     "removedPinCode": "Código PIN removido com sucesso",
-    "close": "Perto"
+    "close": "Perto",
+    "confirmPin": ""
   },
   "contactDetailScreen": {
     "addNewContact": "Adicionar novo contato",

diff --git a/languages/ru.json b/languages/ru.json
@@ -38,7 +38,8 @@
     "submit": "",
     "share": "",
     "shareSettings": "",
-    "searchUsers": ""
+    "searchUsers": "",
+    "noFilters": ""
   },
   "loginScreen": {
     "domain": {
@@ -89,7 +90,8 @@
     "incorrectPin": "Неверный PIN-код",
     "savedPinCode": "PIN-код успешно сохранен",
     "removedPinCode": "PIN-код успешно удален",
-    "close": "близко"
+    "close": "близко",
+    "confirmPin": ""
   },
   "contactDetailScreen": {
     "addNewContact": "Добавить новый контакт",

diff --git a/languages/sl.json b/languages/sl.json
@@ -38,7 +38,8 @@
     "submit": "",
     "share": "",
     "shareSettings": "",
-    "searchUsers": ""
+    "searchUsers": "",
+    "noFilters": ""
   },
   "loginScreen": {
     "domain": {
@@ -89,7 +90,8 @@
     "incorrectPin": "Napačna koda PIN",
     "savedPinCode": "Koda PIN je bila uspešno shranjena",
     "removedPinCode": "Koda PIN je bila uspešno odstranjena",
-    "close": "Zapri"
+    "close": "Zapri",
+    "confirmPin": ""
   },
   "contactDetailScreen": {
     "addNewContact": "Dodaj nov stik",

diff --git a/languages/sr.json b/languages/sr.json
@@ -38,7 +38,8 @@
     "submit": "",
     "share": "",
     "shareSettings": "",
-    "searchUsers": ""
+    "searchUsers": "",
+    "noFilters": ""
   },
   "loginScreen": {
     "domain": {
@@ -89,7 +90,8 @@
     "incorrectPin": "Нетачан ПИН",
     "savedPinCode": "ПИН код је успешно сачуван",
     "removedPinCode": "ПИН код је успешно уклоњен",
-    "close": "Близу"
+    "close": "Близу",
+    "confirmPin": ""
   },
   "contactDetailScreen": {
     "addNewContact": "Додај нови контакт",

diff --git a/languages/sw.json b/languages/sw.json
@@ -38,7 +38,8 @@
     "submit": "",
     "share": "",
     "shareSettings": "",
-    "searchUsers": ""
+    "searchUsers": "",
+    "noFilters": ""
   },
   "loginScreen": {
     "domain": {
@@ -89,7 +90,8 @@
     "incorrectPin": "PIN isiyo sahihi",
     "savedPinCode": "Nambari ya siri imehifadhiwa kwa mafanikio",
     "removedPinCode": "Nambari ya siri imeondolewa kwa mafanikio",
-    "close": "Funga"
+    "close": "Funga",
+    "confirmPin": ""
   },
   "contactDetailScreen": {
     "addNewContact": "Ongeza Mawasiliano Mpya",

diff --git a/languages/tr.json b/languages/tr.json
@@ -38,7 +38,8 @@
     "submit": "",
     "share": "",
     "shareSettings": "",
-    "searchUsers": ""
+    "searchUsers": "",
+    "noFilters": ""
   },
   "loginScreen": {
     "domain": {
@@ -89,7 +90,8 @@
     "incorrectPin": "Yanlış PIN",
     "savedPinCode": "PIN kodu başarıyla kaydedildi",
     "removedPinCode": "PIN kodu başarıyla kaldırıldı",
-    "close": "Kapat"
+    "close": "Kapat",
+    "confirmPin": ""
   },
   "contactDetailScreen": {
     "addNewContact": "Yeni bağlantı ekle",