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

app_kit/appbuilder/JSONBuilders/TaxonProfilesJSONBuilder.py

@@ -566,6 +566,16 @@ class TaxonProfilesJSONBuilder(JSONBuilder):
                 taxon_json = self.app_release_builder.taxa_builder.serialize_taxon_extended(relationship.taxon)
                 related_taxon_json = self.app_release_builder.taxa_builder.serialize_taxon_extended(relationship.related_taxon)
                 
+                if relationship.relationship_type.taxon_role == None and relationship.relationship_type.related_taxon_role == None:
+                    # make 'taxon' the profile taxon
+                    if relationship.taxon.taxon_nuid == profile_taxon.taxon_nuid:
+                        pass
+                    else:
+                        # swap
+                        temp = taxon_json
+                        taxon_json = related_taxon_json
+                        related_taxon_json = temp
+                
                 relationship_json = {
                     'taxon': taxon_json,
                     'relatedTaxon': related_taxon_json,

app_kit/appbuilder/TaxonBuilder.py

@@ -111,8 +111,10 @@ class TaxonSerializer:
     
     def serialize(self):
         
-        if str(self.lazy_taxon.name_uuid) in self.taxa_builder.cache['simple']:
-            taxon_json = self.taxa_builder.cache['simple'][str(self.lazy_taxon.name_uuid)]
+        name_uuid_str = str(self.lazy_taxon.name_uuid)
+        
+        if name_uuid_str in self.taxa_builder.cache['simple']:
+            taxon_json = self.taxa_builder.cache['simple'][name_uuid_str]
         
         else:
             taxon_json = {
@@ -123,7 +125,7 @@ class TaxonSerializer:
                 'taxonNuid' : self.lazy_taxon.taxon_nuid,
             }
             
-            self.taxa_builder.cache['simple'][str(self.lazy_taxon.name_uuid)] = taxon_json
+            self.taxa_builder.cache['simple'][name_uuid_str] = taxon_json
         
         taxon_json_copy = copy.deepcopy(taxon_json)
         
@@ -173,8 +175,10 @@ class TaxonSerializer:
 
     def serialize_extended(self):
         
-        if str(self.lazy_taxon.name_uuid) in self.taxa_builder.cache['extended']:
-            taxon_json = self.taxa_builder.cache['extended'][str(self.lazy_taxon.name_uuid)]
+        name_uuid_str = str(self.lazy_taxon.name_uuid)
+        
+        if name_uuid_str in self.taxa_builder.cache['extended']:
+            taxon_json = self.taxa_builder.cache['extended'][name_uuid_str]
             
         else:
         
@@ -201,7 +205,7 @@ class TaxonSerializer:
                 taxon_json['shortProfile'] = taxon_profile.short_profile
             
             
-            self.taxa_builder.cache['extended'][str(self.lazy_taxon.name_uuid)] = taxon_json
+            self.taxa_builder.cache['extended'][name_uuid_str] = taxon_json
 
         taxon_json_copy = copy.deepcopy(taxon_json)
         
@@ -222,8 +226,10 @@ class TaxonSerializer:
     
     def serialize_images(self):
         
-        if str(self.lazy_taxon.name_uuid) in self.taxa_builder.cache['images']:
-            taxon_images = self.taxa_builder.cache['images'][str(self.lazy_taxon.name_uuid)]
+        name_uuid_str = str(self.lazy_taxon.name_uuid)
+        
+        if name_uuid_str in self.taxa_builder.cache['images']:
+            taxon_images = self.taxa_builder.cache['images'][name_uuid_str]
         
         else:
                 
@@ -314,7 +320,7 @@ class TaxonSerializer:
                     collected_content_image_ids.add(taxon_image.id)
                     collected_image_store_ids.add(taxon_image.image_store.id)
     
-            self.taxa_builder.cache['images'][str(self.lazy_taxon.name_uuid)] = taxon_images
+            self.taxa_builder.cache['images'][name_uuid_str] = taxon_images
             
         taxon_images_copy = copy.deepcopy(taxon_images)
         
@@ -361,8 +367,10 @@ class TaxonSerializer:
     
     def serialize_as_registry_taxon(self, languages, name_type, name, is_preferred_name, accepted_name_uuid=None):
         
-        if str(self.lazy_taxon.name_uuid) in self.taxa_builder.cache['registry']:
-            registry_taxon_json = self.taxa_builder.cache['registry']
+        name_uuid_str = str(self.lazy_taxon.name_uuid)
+        
+        if name_uuid_str in self.taxa_builder.cache['registry']:
+            registry_taxon_json = self.taxa_builder.cache['registry'][name_uuid_str]
             
         else:
         

app_kit/context_processors.py

@@ -1,12 +1,19 @@
 from django.conf import settings
+import importlib.metadata
 
 def app_kit_context(request):
-    context =  {
-        'app_kit_mode' : settings.APP_KIT_MODE,
-        'app_kit_sandbox_user' : settings.APP_KIT_SANDBOX_USER,
-        'app_kit_sandbox_password' : settings.APP_KIT_SANDBOX_PASSWORD,
-        'app_kit_short_name' : getattr(settings, 'APP_KIT_SHORT_NAME', 'LC APP KIT'),
-        'app_kit_long_name' : getattr(settings, 'APP_KIT_LONG_NAME', 'LOCAL COSMOS APP KIT'),
+    try:
+        app_kit_version = importlib.metadata.version('localcosmos_app_kit')
+    except importlib.metadata.PackageNotFoundError:
+        app_kit_version = 'unknown'
+    
+    context = {
+        'app_kit_mode': settings.APP_KIT_MODE,
+        'app_kit_sandbox_user': settings.APP_KIT_SANDBOX_USER,
+        'app_kit_sandbox_password': settings.APP_KIT_SANDBOX_PASSWORD,
+        'app_kit_short_name': getattr(settings, 'APP_KIT_SHORT_NAME', 'LC APP KIT'),
+        'app_kit_long_name': getattr(settings, 'APP_KIT_LONG_NAME', 'LOCAL COSMOS APP KIT'),
+        'app_kit_version': app_kit_version,
     }
 
     return context

app_kit/features/backbonetaxonomy/forms.py

@@ -5,6 +5,7 @@ from django.db.models.fields import BLANK_CHOICE_DASH
 
 
 from taxonomy.lazy import LazyTaxon
+from taxonomy.fields import HiddenTaxonField
 
 from app_kit.features.backbonetaxonomy.models import BackboneTaxonomy, BackboneTaxa
 
@@ -89,6 +90,12 @@ class SwapTaxonForm(forms.Form):
             raise forms.ValidationError(_('You cannot select the same taxon twice.'))
         
         return cleaned_data
+
+
+class FixedSwapTaxonForm(forms.Form):
+    
+    from_taxon = HiddenTaxonField()
+    to_taxon = HiddenTaxonField()
     
     
 class TaxonRelationshipTypeForm(LocalizeableModelForm):

app_kit/features/backbonetaxonomy/templates/backbonetaxonomy/ajax/swap_taxon_form.html

@@ -0,0 +1,146 @@
+{% extends 'localcosmos_server/modals/modal_form.html' %}
+{% load i18n localcosmos_tags %}
+
+{% block action %}
+    {% url 'request_swap_taxon' meta_app.id %}
+{% endblock %}
+
+{% block title %}
+	{% blocktrans %}Update taxon{% endblocktrans %}
+{% endblock %}
+
+{% block body %}
+	{% if swapped %}
+		<div class="alert alert-success">
+			{% blocktrans with to_name=to_taxon from_name=from_taxon %}{{ from_name }} has been replaced with {{ to_name }} where possible.{% endblocktrans %}
+		</div>
+	{% else %}
+		<p>
+			{% blocktrans %}You want to swap{% endblocktrans %}
+		</p>
+		<div>
+			<div>
+				<i>{{ from_taxon.taxon_latname }}</i> {{ from_taxon.taxon_author }}
+			</div>
+		</div>
+		<div>
+			<strong>{% trans 'to:' %}</strong>
+			<div>
+				<i>{{ to_taxon.taxon_latname }}</i> {{ to_taxon.taxon_author }}
+			</div>
+		</div>
+		<div>
+			{{ form }}
+		</div>
+		<div>
+			{% if analyzed %}
+				<hr>
+				<div>
+					<div class="mt-3 mb-3">
+						<strong>{% trans 'Analyzation Result:' %}</strong>
+						{% if not verbose_to_taxon_occurrences %}
+							<span class="text-success">
+								<strong>{% trans 'swappable' %}</strong>
+							</span>
+						{% else %}
+							<span class="text-danger">
+								<strong>{% trans 'not swappable' %}</strong>
+							</span>
+						{% endif %}
+					</div>
+							
+					<div>
+
+						<i>{{ from_taxon.taxon_latname }}</i> {{ from_taxon.taxon_author }} {% trans 'occurs in' %}:
+
+						<div class="ml-4">
+							{% if verbose_from_taxon_occurrences %}
+								{% for occurrences in verbose_from_taxon_occurrences %}
+									<div>
+										<div class="my-3">
+											<strong>{{ occurrences.verbose_model_name }}</strong>
+											{% if occurrences.is_swappable %}
+												<span class="badge badge-success">
+													{% trans 'swappable' %}
+												</span>
+											{% else %}
+												<span class="badge badge-danger">
+													{% trans 'not swappable' %}
+												</span>
+											{% endif %}
+										</div>
+										<ul>
+											{% for verbose_occurrence in occurrences.verbose_occurrences %}
+												<li>
+													{{ verbose_occurrence }}
+												</li>
+											{% endfor %}
+										</ul>
+									</div>
+								{% endfor %}
+							{% else %}
+								{% if swapped %}
+									<div class="alert alert-success">
+										{% blocktrans with to_name=to_taxon from_name=from_taxon %}{{ from_name }} has been replaced with {{ to_name }} where possible.{% endblocktrans %}
+									</div>
+								{% else %}
+									<div class="alert alert-danger">
+										{% blocktrans with name=from_taxon %}{{ name }} does not occur in your app and can't be swapped.{% endblocktrans %}
+									</div>
+								{% endif %}
+							{% endif %}
+						</div>
+					</div>
+					<div class="mt-4">
+
+						<i>{{ to_taxon.taxon_latname }}</i> {{ to_taxon.taxon_author }} {% trans 'occurs in' %}:
+
+						<div class="ml-4">
+							{% if verbose_to_taxon_occurrences %}
+								{% for to_occurrences in verbose_to_taxon_occurrences %}
+									<div>
+										<div class="my-3">
+											<strong>{{ to_occurrences.verbose_model_name }}</strong>
+										</div>
+										<ul>
+											{% for to_verbose_occurrence in to_occurrences.verbose_occurrences %}
+												<li>
+													{{ to_verbose_occurrence }}
+												</li>
+											{% endfor %}
+										</ul>
+									</div>
+								{% endfor %}
+							{% else %}
+									
+								<div class="text-muted">
+									{% blocktrans %}No occurrences found.{% endblocktrans %}
+								</div>
+							{% endif %}
+						</div>
+					</div>
+				</div>
+			{% endif %}
+		</div>
+	{% endif %}
+{% endblock %}
+
+{% block footer %}
+	<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{% trans 'Close' %}</button>
+	{% if not verbose_to_taxon_occurrences %}
+		<button type="submit" class="btn btn-outline-primary">{% trans 'Swap' %}</button>
+	{% endif %}
+{% endblock %}
+
+{% block script %}
+	{% if swapped %}
+	
+		<script>
+			let element = document.getElementById("{{ from_taxon.name_uuid }}");
+			if (element) {
+				element.remove();
+			}
+			$("#Modal").modal("hide");
+		</script>
+	{% endif %}
+{% endblock %}

app_kit/features/backbonetaxonomy/templates/backbonetaxonomy/ajax/taxon_references_changes.html

@@ -0,0 +1,153 @@
+{% load i18n static %}
+
+<div class="row">
+    <div class="col-12">
+        <div class="mt-5">
+            <h2>{% trans 'Taxa with changes only in organizational data (e.g. position in tree)' %}</h2>
+        </div>
+        <div class="card">
+            <div class="card-body">
+                {% if result.position_or_name_uuid_changed %}
+                    <div class="row">
+                        <div class="col-12">
+                            <div class="alert alert-info">
+                                {% blocktrans %}These taxa had changes only in organizational data like their position in the taxonomic tree. You can safely update these taxa without changing their scientific name or author.{% endblocktrans %}
+                            </div>
+                        </div>
+                    </div>
+                    <div class="card-text">
+                        {% for taxon in result.position_or_name_uuid_changed %}
+                            <div>
+                                <i>{{ taxon.taxon_latname }}</i> {{ taxon.taxon_author }}
+                            </div>
+                        {% endfor %}
+                    </div>
+                    <div>
+                        <form method="post" action="{% url 'update_taxon_references' meta_app.id %}">
+                            {% csrf_token %}
+                            <button type="submit" class="btn btn-primary mt-3">
+                                {% trans 'Update these taxa' %}
+                            </button>
+                        </form>
+                    </div>
+                {% else %}
+                     <div class="text-muted">
+                        {% trans 'No taxa with changes in organizational data found.' %}
+                    </div>
+                {% endif %}
+                
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="row mt-5">
+    <div class="col-12">
+        <div>
+            <h2>{% trans 'Taxa with potentially new author' %}</h2>
+        </div>
+
+
+        {% if result.taxa_new_author %}
+                    
+            {% for entry in result.taxa_new_author %}
+                <div id="{{ entry.taxon.name_uuid }}" class="card">
+                    <div class="card-body">
+                        <h5 class="card-title">
+                            <i>{{ entry.taxon.taxon_latname }}</i> {{ entry.taxon.taxon_author }}
+                        </h5>
+                        <div class="card-text">
+                            <strong>{% trans 'New author names:' %}</strong>
+                            <div class="my-3">
+                                {% for similar_entry in entry.new_author_taxa %}
+                                    <div class="d-flex align-items-center">
+                                        <div class="pr-3">
+                                            <i>{{ similar_entry.similar_taxon.taxon_latname }}</i> {{ similar_entry.similar_taxon.taxon_author }} 
+                                        </div>
+                                        <div>
+                                            <form action="{% url 'request_analyze_taxon' meta_app.id %}" class="xhr" ajax-target="ModalContent" method="POST">
+                                                {{ similar_entry.form }}
+                                                <button type="submit" class="btn btn-xs btn-success nodisable">{% trans 'accept' %}</button>
+                                            </form>
+                                        </div>
+                                    </div>
+                                {% endfor %}
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            {% endfor %}
+            
+        {% else %}
+            <div class="text-muted">
+                {% trans 'No taxa with new author found.' %}
+            </div>
+        {% endif %}
+    </div>
+</div>
+
+<div>
+<div class="row mt-5">
+    <div class="col-12">
+        <div>
+            <h2>{% trans 'Taxa now found as a synonym' %}</h2>
+        </div>
+        {% if result.taxa_in_synonyms %}
+            {% for entry in result.taxa_in_synonyms %}
+                <div id="{{ entry.taxon.name_uuid }}" class="card">
+                    <div class="card-body">
+                        <h5 class="card-title">
+                            <i>{{ entry.taxon.taxon_latname }}</i> {{ entry.taxon.taxon_author }}
+                        </h5>
+                        
+                        <div class="card-text">
+                            <div class="d-flex align-items-center">
+                                <div class="pr-2">
+                                    <strong>{% trans 'accepted name:' %}</strong>
+                                </div>
+                                <div class="pr-3">
+                                    <i>{{ entry.taxon.reference_accepted_name.taxon_latname }}</i> {{ entry.taxon.reference_accepted_name.taxon_author }}
+                                </div>
+                                <div>
+                                    <form action="{% url 'request_analyze_taxon' meta_app.id %}" class="xhr" ajax-target="ModalContent" method="POST">
+                                        {{ entry.form }}
+                                        <button type="submit" class="btn btn-xs btn-success nodisable">{% trans 'accept' %}</button>
+                                    </form>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            {% endfor %}
+        {% else %}
+            <div class="text-muted">
+                {% trans 'No taxa found as synonyms.' %}
+            </div>
+        {% endif %}
+    </div>
+</div>
+<div class="row my-5">
+    <div class="col-12">
+        <div>
+            <h2>{% trans 'Taxa not found in the taxonomic database anymore' %}</h2>
+        </div>
+        {% if result.taxa_missing %}
+            <div class="card">
+                <div class="card-body">
+                    
+                    <div class="card-text">
+                        {% for taxon in result.taxa_missing %}
+                            <div>
+                                {{ taxon }}
+                            </div>
+                        {% endfor %}
+                    </div>
+                </div>
+            </div>
+        {% else %}
+            <div class="text-muted">
+                {% trans 'No missing taxa found.' %}
+            </div>
+        {% endif %}
+    </div>
+</div>

app_kit/features/backbonetaxonomy/templates/backbonetaxonomy/manage_backbonetaxonomy.html

@@ -10,7 +10,7 @@
 				<small><span class="badge badge-info">{% trans 'Total:' %} {{ meta_app.taxon_count }}<span></small>
 			</h4>
 
-			<form class="form-inline">
+			<form>
 				{% if generic_content.include_full_tree and alltaxa %}
 				{% else %}
 					<div class="form-group">

app_kit/features/backbonetaxonomy/templates/backbonetaxonomy/update_taxon_references.html

@@ -1,5 +1,5 @@
 {% extends 'app_kit/manage_generic_content.html' %}
-{% load i18n localcosmos_tags %}
+{% load i18n static localcosmos_tags %}
 
 {% block content %}
 
@@ -13,49 +13,33 @@
         </div>
     </div>
     <div>
-        <div class="alert alert-info">
-            {% blocktrans %}If you updated your taxonomic database you can update your taxonomic references here. Taxonomic references can be Taxa of Taxon Profiles or linked Taxa in Nature Guides.
-            This update does not alter the scientific names or authors. It updates other parameters like the position of a taxon in the taxonomic tree.
-            If a taxon is not found anymore in the referenced taxonomic database, this will not be fixed by this update mechanism. You have to use the Taxon Swap feature to select a new Taxon.{% endblocktrans %}
-        </div>
+        <p>
+            {% blocktrans %}If you updated your taxonomic database you can update your taxonomic references here.{% endblocktrans %}
+        </p>
     </div>
-    <div class="row">
-        <div class="col-12">
-            {% for error in result %}
-                <div>
-                    <div>
-                        <strong>
-                            {{ error.taxon }}
-                        </strong>
-                    </div>
-                    <div>
-                        <ul>
-                            {% for error_message in error.errors %}
-                                <li>
-                                    {{ error_message}}
-                                </li>
-                            {% endfor %}
-                        </ul>
-                    </div>
-                </div>
-            {% endfor %}
-        <div>
-        {% if updated %}
+    {% if updated %}
+        <div class="row my-5">
             <div class="col-12">
                 <div class="alert alert-success">
-                    {% trans 'Taxon references have been updated successfully.' %}
+                    {% trans "Taxon references have been updated successfully. Some taxa might require manual review. See below." %}
                 </div>
             </div>
-        {% endif %}
-        <div class="col-12">
-            <form id="update-taxa-form" method="POST" action="{% url 'update_taxon_references' meta_app.id %}">
-                {% csrf_token %}
-                <button type="submit" class="btn btn-primary">
-                    {% trans 'Perform Update' %}
-                </button>
-            </form>
         </div>
+    {% endif %}
+    <div class="row">
+        <div id="check-result" class="col-12">
+            <div class="text-center my-5">
+                <img src="{% static 'app_kit/images/spinner.gif' %}" /> 
+            </div>
+        <div>
     </div>
 </div>
 
+<script>
+    $.get("{% url 'get_taxon_references_changes' meta_app.id %}", (html) => {
+        $("#check-result").html(html);
+        ajaxify('check-result')
+    });
+</script>
+
 {% endblock %}