Pilar
|
c61dca2fe6
|
from usage_zone to usage
|
2023-01-26 08:53:00 -05:00 |
|
|
|
1b47ea64b5
|
Clean up:
Some old not implemented classes have been removed
Some pep8 improvements done too
|
2023-01-26 07:41:56 -05:00 |
|
|
|
4e0b17d7ee
|
Correct the mistakes during the merge.
Now everithing should work as expected.
One minor improvement in the error function for the factories.
|
2023-01-26 06:35:55 -05:00 |
|
|
|
ff4fef17fb
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# hub/catalog_factories/construction_catalog_factory.py
# hub/imports/construction_factory.py
# hub/imports/usage_factory.py
|
2023-01-26 05:23:22 -05:00 |
|
|
|
2ebec93ab4
|
Merge disaster:
I do expect a lot of errors in this merge, this will be review later on, please don't rebase into this one
|
2023-01-26 05:21:34 -05:00 |
|
Guillermo Gutierrez Morote
|
e8f90c1141
|
Merge branch 'db_persistence' into 'master'
Included checks for import handlers and types
See merge request Guille/hub!50
|
2023-01-26 09:14:22 +00:00 |
|
Peter Yefi
|
d04906306e
|
Included checks for import handlers and types
|
2023-01-25 19:13:00 -05:00 |
|
|
|
ec9878eaf8
|
Remove unwanted print
|
2023-01-25 06:39:03 -05:00 |
|
|
|
b4b75b5e12
|
Small correction in unittests
|
2023-01-25 06:38:08 -05:00 |
|
Guillermo Gutierrez Morote
|
2cfe3b7af8
|
Merge branch 'dist' into 'master'
Dist
See merge request Guille/hub!48
|
2023-01-25 10:36:09 +00:00 |
|
|
|
f5333c0975
|
packaging version working as spected
|
2023-01-25 05:21:12 -05:00 |
|
|
|
9700e5ce21
|
packaging version
|
2023-01-24 10:51:50 -05:00 |
|
Guillermo Gutierrez Morote
|
ddf8e6dcfe
|
Merge branch 'db_persistence' into 'master'
Db persistence
See merge request Guille/hub!47
|
2023-01-18 05:00:50 +00:00 |
|
Peter Yefi
|
f1b16dde6d
|
Removed city object from db factory constructor
|
2023-01-17 20:04:56 -05:00 |
|
Peter Yefi
|
169c79650e
|
Included message for wrong authentication
|
2023-01-17 19:53:46 -05:00 |
|
Pilar
|
5dd3e8c018
|
Merge remote-tracking branch 'origin/master'
|
2023-01-17 06:34:16 -05:00 |
|
Pilar
|
49b4ce5ef2
|
added a post-process in idf to erase windows associated to adiabatic walls
|
2023-01-17 06:34:00 -05:00 |
|
Guillermo Gutierrez Morote
|
c82134b04f
|
Merge branch 'db_persistence' into 'master'
Db persistence
See merge request Guille/hub!46
|
2023-01-17 06:01:46 +00:00 |
|
Peter Yefi
|
708075fd3c
|
create log file automatically if it doesn't exist
|
2023-01-16 14:11:08 -05:00 |
|
Peter Yefi
|
d3ab8d3531
|
Merge branch 'master' into db_persistence
|
2023-01-16 13:49:14 -05:00 |
|
Peter Yefi
|
6ba10b0e02
|
Removed .env
|
2023-01-16 13:48:01 -05:00 |
|
Pilar
|
17d4f3d8bc
|
prints for debug in unittest
|
2023-01-16 10:02:35 -05:00 |
|
Pilar
|
4098550b1b
|
fixed bug in idf.py: window construction gave errors
|
2023-01-16 09:22:18 -05:00 |
|
Pilar
|
78449d83be
|
Merge branch 'integrating_alkis_codes'
|
2023-01-16 08:23:11 -05:00 |
|
|
|
30f683ea9f
|
Correct merge error
|
2023-01-16 08:05:23 -05:00 |
|
|
|
a41ae23c20
|
Correct merge error
|
2023-01-16 07:57:16 -05:00 |
|
|
|
c66367fede
|
Correct merge error
|
2023-01-16 07:57:02 -05:00 |
|
Pilar
|
23cca13359
|
added city_layers_test.py, solved bugs in gpandas importer and idf exporter
|
2023-01-16 05:21:53 -05:00 |
|
|
|
6c54e82ea3
|
Merge remote-tracking branch 'origin/db_persistence'
# Conflicts:
# helpers/enrich_city.py
|
2023-01-16 04:36:51 -05:00 |
|
Peter Yefi
|
b405297f76
|
Fixed casing issues with roles
|
2023-01-13 18:42:11 -05:00 |
|
Peter Yefi
|
f875411347
|
Added user referenc to city creation
|
2023-01-11 16:02:33 -05:00 |
|
Peter Yefi
|
c434b5593f
|
fixed issued with role enum
|
2023-01-10 20:30:55 -05:00 |
|
Peter Yefi
|
db9f286992
|
Fixed issue with user persistence
|
2023-01-10 12:52:20 -05:00 |
|
Peter Yefi
|
6383a47aa0
|
Added user id reference to cities. Included updated timestamp
|
2023-01-10 12:26:08 -05:00 |
|
Peter Yefi
|
3dc74371f4
|
Added logging
|
2023-01-10 12:03:27 -05:00 |
|
Pilar
|
64fd59db73
|
changed parameter name 'sra' to 'simplified_radiosity_algorithm' in simplified_radiosity_algorithm exporter
|
2023-01-10 10:45:05 -05:00 |
|
Pilar
|
0605d5b4f6
|
updating the code to changes in hub (not finished -> not working)
|
2023-01-10 09:55:38 -05:00 |
|
Guillermo Gutierrez Morote
|
609ad59371
|
Merge branch 'db_persistence' into 'master'
Db persistence
See merge request Guille/hub!44
|
2023-01-09 21:56:46 +00:00 |
|
Guillermo Gutierrez Morote
|
4bf2ff4ff0
|
Merge branch 'master' into 'db_persistence'
# Conflicts:
# .gitignore
# city_model_structure/city.py
# requirements.txt
# unittests/test_energy_systems_water_to_water_hp.py
|
2023-01-09 21:36:44 +00:00 |
|
Pilar
|
2ffbf06ac5
|
centralized all dictionaries in helpers.dictionaries.py and reviewed all those from hub to something
|
2022-12-16 07:21:33 -05:00 |
|
Pilar
|
c0e60f27c7
|
completed NRCAN usage catalog importer and NRCAN usage importer
started NRCAN construction catalog importer and NRCAN construction importer but not working!
|
2022-12-15 07:42:59 -05:00 |
|
Peter Yefi
|
2d301853d6
|
Added logging to persistence
|
2022-12-14 17:49:29 -05:00 |
|
Peter Yefi
|
bf66069e3a
|
Fixed error with setup
|
2022-12-08 20:55:12 -05:00 |
|
Peter Yefi
|
4693edd5e8
|
Added user authentication capabilities to hub
|
2022-12-08 20:54:47 -05:00 |
|
Peter Yefi
|
23ce8665a2
|
Added documentation for database setup
|
2022-12-07 19:06:17 -05:00 |
|
Pilar
|
4080b0ad8f
|
bug in function assignment. Dictionaries must be reviewed
|
2022-12-07 11:04:04 -05:00 |
|
Pilar
|
b34b07b161
|
added nrcan importer
usage importer now reads from catalogs
|
2022-12-07 10:54:28 -05:00 |
|
Pilar
|
09bbe07ccb
|
Merge branch 'master' into review_usage_and_construction_catalogs
|
2022-12-06 15:30:30 -05:00 |
|
Guillermo Gutierrez Morote
|
2ad54940ab
|
Merge branch 'nrcan' into 'master'
Nrcan
See merge request Guille/hub!43
|
2022-12-06 20:29:43 +00:00 |
|
Pilar
|
1f3320c02a
|
cleaning not used classes
|
2022-12-06 15:28:59 -05:00 |
|
