Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
revelis-vincenzo committed Sep 6, 2024
2 parents daa3337 + c8a9d5a commit 306e728
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 11 deletions.
4 changes: 2 additions & 2 deletions ricerca_app/labels.py
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@
'SpinoffAgencyUrl': 'Spinoff Agency Url',
'IsSpinoff': 'Is Spinoff',
'IsStartup': 'Is Startup',
'PersonFunctions': ' Funzioni Persona',
'PersonFunctions': ' Funzioni',
'ProjectId': 'Project Id',
'TerritorialScopeId': 'Territorial Scope Id',
'TerritorialScopeDescription': 'Territorial Scope',
Expand Down Expand Up @@ -849,7 +849,7 @@
'SpinoffAgencyUrl': 'Url Azienda Spinoff',
'IsSpinoff': 'Spinoff',
'IsStartup': 'Startup',
'PersonFunctions': ' Funzioni Persona',
'PersonFunctions': ' Funzioni',
'ProjectId': 'Id Progetto',
'TerritorialScopeId': 'Id Ambito Territoriale',
'TerritorialScopeDescription': 'Ambito Territoriale',
Expand Down
15 changes: 6 additions & 9 deletions ricerca_app/services.py
Original file line number Diff line number Diff line change
Expand Up @@ -3381,7 +3381,7 @@ def getAddressbook(
query = Personale.objects.filter(
query_search,
flg_cessato=0,
cd_uo_aff_org__isnull=False,
# cd_uo_aff_org__isnull=False,
dt_rap_fin__gte=datetime.datetime.today()).values(
"nome",
"middle_name",
Expand Down Expand Up @@ -3415,7 +3415,7 @@ def getAddressbook(
'cd_uo_aff_org__cd_tipo_nodo',
'dt_rap_ini',
'sede'
).distinct()
).filter(cd_uo_aff_org__isnull=False).distinct()

ruoli_dict = {}
for r in ruoli:
Expand Down Expand Up @@ -3728,7 +3728,7 @@ def getPersonale(personale_id, full=False):
'ds_aff_org',
'cd_uo_aff_org__cd_tipo_nodo',
'dt_rap_ini'
).distinct()
).filter(cd_uo_aff_org__isnull=False).distinct()

priorita_tmp = PersonalePrioritaRuolo.objects.values(
'cd_ruolo',
Expand Down Expand Up @@ -3827,6 +3827,7 @@ def getStructure(structureid):
c['unitaorganizzativacontatti__contatto'])
funzioni_personale = UnitaOrganizzativaFunzioni.objects.filter(
cd_csa=q['cd_csa'],
cod_fis__flg_cessato=False,
termine__gt=datetime.datetime.now()).values(
"ds_funzione",
"funzione",
Expand Down Expand Up @@ -4695,7 +4696,7 @@ def getProgramTypes():
query = ProgettoTipologiaProgramma.objects.values(
"id",
"nome_programma"
).distinct()
).order_by('nome_programma').distinct()

return query

Expand All @@ -4705,19 +4706,15 @@ def getProjectInfrastructures():
query = ProgettoDatiBase.objects.values(
"uo",
"uo__denominazione",
).distinct()

).distinct().order_by("uo__denominazione")
query = list(query)

for q in query:
if q['uo'] == None:
query.remove(q)

return query


class ServiceStructure:

@staticmethod
def getStructureChilds(structureid=None):
child = UnitaOrganizzativa.objects.filter(
Expand Down

0 comments on commit 306e728

Please sign in to comment.