Skip to content

update v2 saved searches #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
michaeltfisher wants to merge 9 commits into
base: eamena-migration-branch
Choose a base branch
from
Open

update v2 saved searches #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4e50c16
Merge pull request #5 from azerbini/eamena-migration-branch
TeriForey Jan 24, 2019
37662bb
Reset branch back to status on azerbini fork
TeriForey Jan 24, 2019
446eba4
Updated pyshp version in requirements.txt for SHP export
TeriForey Jan 25, 2019
c128b49
Added a warning to the search export to SHP that attributes will be t…
TeriForey Jan 25, 2019
7eb200a
Changed the fields that are likely to be multivalent or large to a 25…
TeriForey Jan 28, 2019
0fa1f5a
Merge branch 'SHP_export' of https://github.com/TeriForey/eamena_dev …
mradamcox Feb 15, 2019
51a5585
Merge branch 'eamena-migration-branch' of https://github.com/azerbini…
mradamcox Feb 15, 2019
eacdd80
Add files via upload
michaeltfisher Feb 15, 2019
601cdab
Merge branch 'eamena-migration-branch' into mtf_aleppo_search
mradamcox Feb 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions arches/app/models/entity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
from django.db import connection
from django.db import transaction
from django.core.files.uploadedfile import InMemoryUploadedFile, TemporaryUploadedFile
from django.core.files import File
from arches.app.models.concept import Concept
from arches.app.utils.betterJSONSerializer import JSONSerializer, JSONDeserializer
from django.core.exceptions import ObjectDoesNotExist
Expand Down Expand Up @@ -243,7 +242,6 @@ def _save(self):
self.value = themodelinstance.geturl()
self.label = themodelinstance.getname()


for child_entity in self.child_entities:
child = child_entity._save()
rule = archesmodels.Rules.objects.get(entitytypedomain = entity.entitytypeid, entitytyperange = child.entitytypeid, propertyid = child_entity.property)
Expand Down
8 changes: 8 additions & 0 deletions arches/install/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,14 @@ urllib3>=1.23
validators==0.10.3
wsgiref==0.1.2
xlrd==0.9.0
<<<<<<< HEAD
Pillow==2.4.0
rdflib
unicodecsv
pyyaml
pyshp>=2.0.1
=======
>>>>>>> 7ab0cdfb9690a3e7e86b746f179aaed825c10ea7

# Leave the following line commented so that pip install will ignore this
# The installer uses the following line to download the proper version of ES
Expand Down
40 changes: 20 additions & 20 deletions eamena/eamena/source_data/business_data/resource_export_mappings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,32 +650,32 @@
{"field_name": "Geom_Cert","source": "field_map", "data_type":"str", "data_length":"128"},
{"field_name": "Loc_Cert","source": "field_map", "data_type":"str", "data_length":"128"},
{"field_name": "Topography","source": "field_map", "data_type":"str", "data_length":"128"},
{"field_name": "Period","source": "field_map", "data_type":"str", "data_length":"128"},
{"field_name": "Per_Cert","source": "field_map", "data_type":"str", "data_length":"128"},
{"field_name": "Form","source": "field_map", "data_type":"str", "data_length":"128"},
{"field_name": "Form_Cert","source": "field_map", "data_type":"str", "data_length":"128"},
{"field_name": "Arrangement","source": "field_map", "data_type":"str", "data_length":"128"},
{"field_name": "Feature_No","source": "field_map", "data_type":"str", "data_length":"128"},
{"field_name": "Feat_Shape","source": "field_map", "data_type":"str", "data_length":"128"},
{"field_name": "Interpretation","source": "field_map", "data_type":"str", "data_length":"128"},
{"field_name": "Inter_Cert","source": "field_map", "data_type":"str", "data_length":"128"},
{"field_name": "Inter_No","source": "field_map", "data_type":"str", "data_length":"128"},
{"field_name": "Period","source": "field_map", "data_type":"str", "data_length":"255"},
{"field_name": "Per_Cert","source": "field_map", "data_type":"str", "data_length":"255"},
{"field_name": "Form","source": "field_map", "data_type":"str", "data_length":"255"},
{"field_name": "Form_Cert","source": "field_map", "data_type":"str", "data_length":"255"},
{"field_name": "Arrangement","source": "field_map", "data_type":"str", "data_length":"255"},
{"field_name": "Feature_No","source": "field_map", "data_type":"str", "data_length":"255"},
{"field_name": "Feat_Shape","source": "field_map", "data_type":"str", "data_length":"255"},
{"field_name": "Interpretation","source": "field_map", "data_type":"str", "data_length":"255"},
{"field_name": "Inter_Cert","source": "field_map", "data_type":"str", "data_length":"255"},
{"field_name": "Inter_No","source": "field_map", "data_type":"str", "data_length":"255"},
{"field_name": "Condition","source": "field_map", "data_type":"str", "data_length":"128"},
{"field_name": "Dist_Extent","source": "field_map", "data_type":"str", "data_length":"128"},
{"field_name": "Dist_Type","source": "field_map", "data_type":"str", "data_length":"128"},
{"field_name": "Dist_Cause","source": "field_map", "data_type":"str", "data_length":"128"},
{"field_name": "DistCauseCert","source": "field_map", "data_type":"str", "data_length":"128"},
{"field_name": "DistDateBefore","source": "field_map", "data_type":"str", "data_length":"128"},
{"field_name": "DistDateOn","source": "field_map", "data_type":"str", "data_length":"128"},
{"field_name": "DistDateFrom","source": "field_map", "data_type":"str", "data_length":"128"},
{"field_name": "DistDateTo","source": "field_map", "data_type":"str", "data_length":"128"},
{"field_name": "DistEffect","source": "field_map", "data_type":"str", "data_length":"128"},
{"field_name": "DistEffCert","source": "field_map", "data_type":"str", "data_length":"128"},
{"field_name": "Dist_Type","source": "field_map", "data_type":"str", "data_length":"255"},
{"field_name": "Dist_Cause","source": "field_map", "data_type":"str", "data_length":"255"},
{"field_name": "DistCauseCert","source": "field_map", "data_type":"str", "data_length":"255"},
{"field_name": "DistDateBefore","source": "field_map", "data_type":"str", "data_length":"255"},
{"field_name": "DistDateOn","source": "field_map", "data_type":"str", "data_length":"255"},
{"field_name": "DistDateFrom","source": "field_map", "data_type":"str", "data_length":"255"},
{"field_name": "DistDateTo","source": "field_map", "data_type":"str", "data_length":"255"},
{"field_name": "DistEffect","source": "field_map", "data_type":"str", "data_length":"255"},
{"field_name": "DistEffCert","source": "field_map", "data_type":"str", "data_length":"255"},
{"field_name": "ThreatType","source": "field_map", "data_type":"str", "data_length":"128"},
{"field_name": "ThreatCause","source": "field_map", "data_type":"str", "data_length":"128"},
{"field_name": "ThrCauseCert","source": "field_map", "data_type":"str", "data_length":"128"},
{"field_name": "Desc_Type","source": "field_map", "data_type":"str", "data_length":"128"},
{"field_name": "Description","source": "field_map", "data_type":"str", "data_length":"128"},
{"field_name": "Description","source": "field_map", "data_type":"str", "data_length":"255"},
{"field_name": "Assessor","source": "field_map", "data_type":"str", "data_length":"128"}
],
"RESOURCE_TYPES": {
Expand Down
2 changes: 1 addition & 1 deletion eamena/eamena/templates/search.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
<li><a href="javascript:void(0);" id="view-saved-searches">{% trans "View Popular Searches" %}</a></li>
<li class="divider"></li>
{% if 'edit' in user.user_groups %}
<li><a class="dataexport" id="shp" href="" target="_blank">{% trans "Export results to .SHP" %}</a></li>
<li><a class="dataexport" id="shp" href="" target="_blank" onclick="return confirm('Warning: Shapefile export will truncate attributes to 250 characters')">{% trans "Export results to .SHP" %}</a></li>
<li><a class="dataexport" id="csv" href="" target="_blank">{% trans "Export results to .CSV" %} </a></li>
<li><a class="dataexport" id="kml" href="" target="_blank">{% trans "Export results to .KML" %} </a></li>
<li><a class="dataexport" id="json" href="" target="_blank">{% trans "Export results to .JSON" %} </a></li>
Expand Down
40 changes: 40 additions & 0 deletions saved-searches.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@

<br>

<br>
<!-- Site types -->
<div>
<dt>
<h5 id="arches-measurement-form" class="section-headline"> Sites in and around the Aleppo UNESCO WHS, Syria: </h5>
</dt>

</div>

<br>

<br>
<!-- Service Blocks -->
<div class="row margin-bottom-40">
<div class="col-sm-4">
<div class="servive-block servive-block-default">
<i class="icon-custom rounded-x icon-bg-dark fa fa-university"></i>
<a class= "" href='?page=1&termFilter=%5B%5B%7B"inverted"%3Afalse%2C"type"%3A"string"%2C"context"%3A""%2C"context_label"%3A""%2C"id"%3A"Aleppo%20Reference"%2C"text"%3A"Aleppo%20Reference"%2C"value"%3A"Aleppo%20Reference"%7D%5D%5D&temporalFilter=%5B%7B"year_min_max"%3A%5B%5D%2C"filters"%3A%5B%5D%2C"inverted"%3Afalse%7D%5D&spatialFilter=%7B"geometry"%3A%7B"type"%3A""%2C"coordinates"%3A%5B%5D%7D%2C"buffer"%3A%7B"width"%3A"0"%2C"unit"%3A"m"%7D%2C"inverted"%3Afalse%7D&mapExpanded=true&timeExpanded=false&booleanSearch=and&searchRelatedResources=false&termFilterAndOr=%5B"and"%5D&termFilterCombineWithPrev=%5B%5Bfalse%5D%5D&termFilterGroup=%5B"No%20group"%5D&advancedSearch=false&include_ids=false'><h2 class="txt-color-blue">Aleppo Environs Heritage Places</h2></a><p>View a foundset of Heritage Places surrounding the Aleppo Citadel.</p>
</div>
</div>

<div class="col-sm-4">
<div class="servive-block servive-block-default">
<i class="icon-custom rounded-x icon-bg-dark fa fa-university"></i>
<a class= "" href='?page=1&termFilter=%5B%5B%7B"inverted"%3Afalse%2C"type"%3A"string"%2C"context"%3A""%2C"context_label"%3A""%2C"id"%3A"eamena-f"%2C"text"%3A"eamena-f"%2C"value"%3A"eamena-f"%7D%5D%5D&temporalFilter=%5B%7B"year_min_max"%3A%5B%5D%2C"filters"%3A%5B%5D%2C"inverted"%3Afalse%7D%5D&spatialFilter=%7B"geometry"%3A%7B"type"%3A""%2C"coordinates"%3A%5B%5D%7D%2C"buffer"%3A%7B"width"%3A"0"%2C"unit"%3A"m"%7D%2C"inverted"%3Afalse%7D&mapExpanded=true&timeExpanded=false&booleanSearch=and&searchRelatedResources=false&termFilterAndOr=%5B"and"%5D&termFilterCombineWithPrev=%5B%5Bfalse%5D%5D&termFilterGroup=%5B"No%20group"%5D&advancedSearch=false&include_ids=false'><h2 class="txt-color-blue">Aleppo Citadel UNESCO WHS Heritage Features</h2></a><p>View a foundset of Heritage Features within the UNESCO World Heritage Site of the Aleppo Citadel.</p>
</div>
</div>

<div class="col-sm-4">
<div class="servive-block servive-block-default">
<i class="icon-custom rounded-x icon-bg-dark fa fa-university"></i>
<a class= "" href='?page=1&termFilter=%5B%5B%7B"inverted"%3Afalse%2C"type"%3A"string"%2C"context"%3A""%2C"context_label"%3A""%2C"id"%3A"Aleppo%20Reference"%2C"text"%3A"Aleppo%20Reference"%2C"value"%3A"Aleppo%20Reference"%7D%2C%7B"inverted"%3Afalse%2C"type"%3A"string"%2C"context"%3A""%2C"context_label"%3A""%2C"id"%3A"EAMENA-F"%2C"text"%3A"EAMENA-F"%2C"value"%3A"EAMENA-F"%7D%5D%5D&temporalFilter=%5B%7B"year_min_max"%3A%5B%5D%2C"filters"%3A%5B%5D%2C"inverted"%3Afalse%7D%5D&spatialFilter=%7B"geometry"%3A%7B"type"%3A""%2C"coordinates"%3A%5B%5D%7D%2C"buffer"%3A%7B"width"%3A"0"%2C"unit"%3A"m"%7D%2C"inverted"%3Afalse%7D&mapExpanded=true&timeExpanded=false&booleanSearch=and&searchRelatedResources=false&termFilterAndOr=%5B"or"%5D&termFilterCombineWithPrev=%5B%5Bfalse%5D%5D&termFilterGroup=%5B"No%20group"%5D&advancedSearch=false&include_ids=true'><h2 class="txt-color-blue">Complete Aleppo Dataset</h2></a><p>See all heritage sites so far identifed and registered through the UNITAR/UNOSAT - EAMENA collaboration</p>
</div>
</div>
</div>


Loading