localcosmos-app-kit 0.9.13__py3-none-any.whl → 0.9.15__py3-none-any.whl

app_kit/appbuilder/AppReleaseBuilder.py

@@ -916,10 +916,10 @@ class AppReleaseBuilder(AppBuilderBase):
 
         # detect duplicates by name
         all_taxon_profiles = TaxonProfile.objects.filter(taxon_profiles=taxon_profiles)
-        for taxon_profile in all_taxon_profiles:
+        for taxon_profile in all_taxon_profiles:            
             duplicates = TaxonProfile.objects.filter(taxon_profiles=taxon_profiles,
                 taxon_source=taxon_profile.taxon_source, taxon_latname=taxon_profile.taxon_latname,
-                taxon_author=taxon_profile.taxon_author).exclude(pk=taxon_profile.pk)
+                taxon_author=taxon_profile.taxon_author, morphotype=taxon_profile.morphotype).exclude(pk=taxon_profile.pk)
             if duplicates.exists():
                 warning_message = _('The taxon profile of %(taxon_latname)s has duplicates.') % {
                     'taxon_latname':taxon_profile.taxon_latname}

app_kit/appbuilder/app/frontends/Multiverse/settings.json

@@ -69,8 +69,8 @@
   },
   "cordova" : {
     "platforms" : {
-      "android" : "android@13.0.0",
-      "ios" : "ios@7.1.0",
+      "android" : "android@14.0.1",
+      "ios" : "ios@8.0.0",
       "browser" : "browser@7.0.0"
     },
     "plugins" : [

app_kit/features/nature_guides/matrix_filter_forms.py

@@ -5,7 +5,7 @@ from django import forms
 
 from localcosmos_server.forms import LocalizeableForm
 
-from .models import MatrixFilter
+from .models import MatrixFilter, IDENTIFICATION_MODE_POLYTOMOUS
 from .matrix_filters import MATRIX_FILTER_TYPES
 
 from .forms import is_active_field
@@ -63,6 +63,22 @@ class MatrixFilterManagementForm(LocalizeableForm):
                 raise forms.ValidationError(_('A matrix filter with this name already exists.'))
 
         return name
+    
+    
+    def clean(self):
+        cleaned_data = super().clean()
+
+        identification_mode = self.meta_node.identification_mode
+        
+        if identification_mode == IDENTIFICATION_MODE_POLYTOMOUS and not self.matrix_filter:
+            
+            filter_exists = MatrixFilter.objects.filter(meta_node=self.meta_node).exists()
+            
+            if filter_exists:
+                raise forms.ValidationError(_('In polytomous identification mode, only one matrix filter is allowed.'))
+            
+        
+        return cleaned_data
 
 
 class MatrixFilterManagementFormWithUnit(MatrixFilterManagementForm):

app_kit/features/nature_guides/models.py

@@ -1130,6 +1130,7 @@ class CrosslinkManager:
 
         is_circular = False
 
+        # you may not link a node to one of its parents
         if crosslink[0].startswith(crosslink[1]):
             is_circular = True
 
@@ -1156,17 +1157,17 @@ class CrosslinkManager:
 
         if is_circular == False:
 
-            found_connection = True
-
             for crosslink in crosslinks:
 
                 # start a new chain
                 chain = [crosslink]
+                found_connection = True
             
                 while found_connection == True and is_circular == False:
                     
                     for crosslink_2 in crosslinks:
 
+                        # get the last nuid in the chain, which is a list of 2-tuples
                         chain_end = chain[-1][1]
 
                         found_connection = False
@@ -1212,6 +1213,8 @@ class NatureGuideCrosslinks(models.Model):
             
             all_crosslinks.append(crosslink_tuple)
 
+        print('Checking crosslinks for circularity:')
+        print(all_crosslinks)
         crosslink_manager =  CrosslinkManager()
         is_circular = crosslink_manager.check_circularity(all_crosslinks)
 

app_kit/features/nature_guides/templates/nature_guides/ajax/manage_matrix_filter.html

@@ -10,15 +10,22 @@
 {% endblock %}
 
 {% block body %}
-	<p>
-		<div>
-			{% render_bootstrap_form form %}
-		</div>
-	</p>
-	{% if success is True %}
-		<div class="alert alert-success">
-			{% trans 'Successfully saved matrix filter.' %}
+
+	{% if adding_allowed == False and not matrix_filter %}
+		<div class="alert alert-warning">
+			{% trans "In dichotomous or polytomous identification mode, only one matrix filter is allowed." %}
 		</div>
+	{% else %}
+		<p>
+			<div>
+				{% render_bootstrap_form form %}
+			</div>
+		</p>
+		{% if success is True %}
+			<div class="alert alert-success">
+				{% trans 'Successfully saved matrix filter.' %}
+			</div>
+		{% endif %}
 	{% endif %}
 {% endblock %}
 

app_kit/features/nature_guides/views.py

@@ -819,6 +819,14 @@ class ManageMatrixFilter(FormLanguageMixin, MetaAppMixin, FormView):
         context['meta_node'] = self.meta_node
         context['filter_type'] = self.filter_type
         context['matrix_filter'] = self.matrix_filter
+        
+        adding_allowed = True
+        if self.meta_node.identification_mode == IDENTIFICATION_MODE_POLYTOMOUS:
+            existing_filters_count = MatrixFilter.objects.filter(meta_node=self.meta_node).count()
+            if existing_filters_count >= 1:
+                adding_allowed = False
+                
+        context['adding_allowed'] = adding_allowed
 
         # fallback
         verbose_filter_name = self.filter_type

app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/manage_taxon_profile_form.html

@@ -63,7 +63,7 @@
 			{% endif %}
 		{% endfor %}
 		{% if form.has_categories %}
-			</div>
+			<!--</div>-->
 		{% endif %}
 	</div>
 

app_kit/features/taxon_profiles/zip_import.py

@@ -260,6 +260,7 @@ class TaxonProfilesZipImporter(GenericContentZipImporter):
 
 
     def validate_external_media(self, url, col_letter, row_index):
+        
         validator = URLValidator()
         
         is_valid = True
@@ -566,6 +567,9 @@ class TaxonProfilesZipImporter(GenericContentZipImporter):
                             elif column_type == ColumnType.EXTERNAL_MEDIA.value:
                                 
                                 external_media_url = cell_value
+                                
+                                if not external_media_url:
+                                    continue
 
                                 external_media_data = self.get_external_media_data_from_external_media_sheet(external_media_url)