Commit ce37993c authored by Mathieu Rodic's avatar Mathieu Rodic

[UPDATE] Changed the project view to fit the new JSON field in node.metadata

https://forge.iscpif.fr/issues/1472
parent 8965527b
...@@ -46,26 +46,26 @@ def project(request, project_id): ...@@ -46,26 +46,26 @@ def project(request, project_id):
# Let's find out about the children nodes of the project # Let's find out about the children nodes of the project
ChildrenNode = aliased(Node) ChildrenNode = aliased(Node)
corpus_query = (session corpus_query = (session
.query(Node, Resource, func.count(ChildrenNode.id)) .query(Node.id, Node.name, Resource.type_id, func.count(ChildrenNode.id))
.outerjoin(ChildrenNode, ChildrenNode.parent_id == Node.id) .outerjoin(ChildrenNode, ChildrenNode.parent_id == Node.id)
.outerjoin(Node_Resource, Node_Resource.node_id == Node.id) .outerjoin(Node_Resource, Node_Resource.node_id == Node.id)
.outerjoin(Resource, Resource.id == Node_Resource.resource_id) .outerjoin(Resource, Resource.id == Node_Resource.resource_id)
.filter(Node.parent_id == project.id) .filter(Node.parent_id == project.id)
.group_by(Node, Resource) .group_by(Node.id, Node.name, Resource.type_id)
.order_by(Node.name) .order_by(Node.name)
) )
corpora_by_resourcetype = defaultdict(list) corpora_by_resourcetype = defaultdict(list)
documents_count_by_resourcetype = defaultdict(int) documents_count_by_resourcetype = defaultdict(int)
corpora_count = 0 corpora_count = 0
for corpus, resource, document_count in corpus_query: for corpus_id, corpus_name, resource_type_id, document_count in corpus_query:
if resource is None: if resource_type_id is None:
resourcetype_name = '(no resource)' resourcetype_name = '(no resource)'
else: else:
resourcetype = cache.ResourceType[resource.type_id] resourcetype = cache.ResourceType[resource_type_id]
resourcetype_name = resourcetype.name resourcetype_name = resourcetype.name
corpora_by_resourcetype[resourcetype_name].append({ corpora_by_resourcetype[resourcetype_name].append({
'id': corpus.id, 'id': corpus_id,
'name': corpus.name, 'name': corpus_name,
'count': document_count, 'count': document_count,
}) })
documents_count_by_resourcetype[resourcetype_name] += document_count documents_count_by_resourcetype[resourcetype_name] += document_count
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment