Skip to content

Commit

Permalink
Issues 13, 14 (#44)
Browse files Browse the repository at this point in the history 
Co-authored-by: Constantin Lungu <lungupconstantin@gmail.com>, Bogdan Hopulele <bogdan@sectorlabs.ro>

* Issue #13, Issue #14

Switch map to run from APIs
Add sidebar with building information
Add map locations filtering based on seismic risk

Additional changes:
- Fix an_construire

* Revert unnecessary changes

* Revert unnecessary changes

* Edit project description (#34)

* Update and format README (#35)

- change docker postgres settings with the right username and password
- format the README to respect markdown linting rules
- add links and sources to some places
- add more info in Contributing, as in code4romania/catpol-declaratii

* Patch migration files

Update db user and password
  • Loading branch information
@bogdanhopu @tudoramariei
bogdanhopu authored and tudoramariei committed Oct 25, 2019
1 parent 2ccf86d commit a71c4f7
Show file tree
Hide file tree
Showing 16 changed files with 722 additions and 426 deletions.
1 change: 1 addition & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Seismic Risc

[![GitHub contributors](https://img.shields.io/github/contributors/code4romania/seismic-risc.svg?style=for-the-badge)](https://github.com/code4romania/seismic-risc/graphs/contributors) [![GitHub last commit](https://img.shields.io/github/last-commit/code4romania/seismic-risc.svg?style=for-the-badge)](https://github.com/code4romania/seismic-risc/commits/master) [![License: MPL 2.0](https://img.shields.io/badge/license-MPL%202.0-brightgreen.svg?style=for-the-badge)](https://opensource.org/licenses/MPL-2.0)

<!-- Please don't remove this: Grab your social icons from https://github.com/carlsednaoui/gitsocial -->
Expand Down
21 changes: 12 additions & 9 deletions seismic_site/map_app/admin.py
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
from django.contrib import admin
import tablib
from django.contrib import admin, messages

from . import models


@admin.register(models.Building)
class BuildingAdmin(admin.ModelAdmin):
list_filter = ['status', 'clasa_categorie', 'nr_postal']
list_display = ['adresa', 'clasa_categorie','an_expertiza', 'expert_atestat', 'status']
list_display = ['adresa', 'clasa_categorie', 'an_expertiza', 'expert_atestat', 'status']
search_fields = ['adresa']


@admin.register(models.CsvFile)
class CSVFileAdmin(admin.ModelAdmin):
actions = ['import_files']
Expand All @@ -20,17 +23,17 @@ def import_files(self, request, query_set):
for header in data.headers:
changed_headers.append(header.lower().replace(':', '').replace('.', '').strip().replace(' ', '_'))
data.headers = changed_headers
building_res = BuildingResource()
building_res = models.BuildingResource()
res = building_res.import_data(data, False, False)
csv_file = CsvFile.objects.get(name=q.__str__())
csv_file = models.CsvFile.objects.get(name=q.__str__())
if res.has_errors() or res.has_validation_errors():
csv_file.status = CsvFile.UNSUCCESS
csv_file.status = models.CsvFile.UNSUCCESS
else:
csv_file.status = CsvFile.SUCCESS
csv_file.status = models.CsvFile.SUCCESS
self.message_user(request, "File with name {} {} imported.".format(q.__str__(),
"was" if csv_file.status == CsvFile.SUCCESS
"was" if csv_file.status == models.CsvFile.SUCCESS
else "wasn't"),
messages.WARNING if csv_file.status == CsvFile.UNSUCCESS else messages.SUCCESS)
messages.WARNING if csv_file.status == models.CsvFile.UNSUCCESS else messages.SUCCESS)
csv_file.save()

import_files.short_description = "Import selected files"
import_files.short_description = "Import selected files"
310 changes: 155 additions & 155 deletions seismic_site/map_app/fixtures/buildings.json
View file
Original file line number Diff line number Diff line change
@@ -1,158 +1,158 @@
[
{
"model": "map_app.building",
"pk": 70,
"fields": {
"clasa_categorie": "0",
"nr_pmb": 2,
"lat": 44.41339,
"long": 26.146,
"loc": "Bucuresti",
"adresa": "Ion Florescu 200",
"nr_postal": "060288",
"sector": "6",
"nr_sector": 6,
"an_construire": 1905,
"regim_inaltime": "23",
"nr_apart": 22,
"arie_desfasurata": 700.0,
"an_expertiza": 2004,
"expert_atestat": "George Marian",
"obs": "Observatie despre cladirea F",
"nr_cadastral": 666,
"nr_carte_funciara": "777",
"actualizare_pmb": "2015-01-01",
"editare_admin": "2015-01-01"
{
"model": "map_app.building",
"pk": 70,
"fields": {
"clasa_categorie": "RS III",
"nr_pmb": 2,
"lat": 44.41339,
"long": 26.146,
"loc": "Bucuresti",
"adresa": "Ion Florescu 200",
"nr_postal": "060288",
"sector": "6",
"nr_sector": 6,
"an_construire": 1905,
"regim_inaltime": "23",
"nr_apart": 22,
"arie_desfasurata": 700.0,
"an_expertiza": 2004,
"expert_atestat": "George Marian",
"obs": "Observatie despre cladirea F",
"nr_cadastral": 666,
"nr_carte_funciara": "777",
"actualizare_pmb": "2015-01-01",
"editare_admin": "2015-01-01"
}
},
{
"model": "map_app.building",
"pk": 71,
"fields": {
"clasa_categorie": "RS II",
"nr_pmb": 4,
"lat": 44.40553,
"long": 26.186,
"loc": "Bucuresti",
"adresa": "Ion Campineanu 300",
"nr_postal": "050277",
"sector": "5",
"nr_sector": 5,
"an_construire": 1904,
"regim_inaltime": "51",
"nr_apart": 3,
"arie_desfasurata": 600.0,
"an_expertiza": 2012,
"expert_atestat": "Ion Vasile",
"obs": "Observatie despre cladirea E",
"nr_cadastral": 555,
"nr_carte_funciara": "666",
"actualizare_pmb": "2016-02-01",
"editare_admin": "2019-01-01"
}
},
{
"model": "map_app.building",
"pk": 72,
"fields": {
"clasa_categorie": "RS I",
"nr_pmb": 2,
"lat": 44.42556,
"long": 26.176,
"loc": "Bucuresti",
"adresa": "Ioan Filitti 402",
"nr_postal": "040266",
"sector": "4",
"nr_sector": 4,
"an_construire": 1903,
"regim_inaltime": "101",
"nr_apart": 41,
"arie_desfasurata": 500.0,
"an_expertiza": 2002,
"expert_atestat": "George Marian",
"obs": "Observatie despre cladirea D",
"nr_cadastral": 444,
"nr_carte_funciara": "555",
"actualizare_pmb": "2018-01-01",
"editare_admin": "2015-02-01"
}
},
{
"model": "map_app.building",
"pk": 73,
"fields": {
"clasa_categorie": "N/A",
"nr_pmb": 11,
"lat": 44.39556,
"long": 26.156,
"loc": "Bucuresti",
"adresa": "Ilarie Chendi 404",
"nr_postal": "030255",
"sector": "3",
"nr_sector": 3,
"an_construire": 1902,
"regim_inaltime": "22",
"nr_apart": 21,
"arie_desfasurata": 400.0,
"an_expertiza": 2003,
"expert_atestat": "Ion Vasile",
"obs": "Observatie despre cladirea C",
"nr_cadastral": 333,
"nr_carte_funciara": "444",
"actualizare_pmb": "2019-01-01",
"editare_admin": "2014-01-01"
}
},
{
"model": "map_app.building",
"pk": 74,
"fields": {
"clasa_categorie": "U3",
"nr_pmb": 12,
"lat": 44.43556,
"long": 26.106984,
"loc": "Bucuresti",
"adresa": "Radu Cristian 500",
"nr_postal": "010233",
"sector": "1",
"nr_sector": 1,
"an_construire": 1900,
"regim_inaltime": "100",
"nr_apart": 40,
"arie_desfasurata": 200.0,
"an_expertiza": 2001,
"expert_atestat": "Ion Vasile",
"obs": "Observatie despre cladirea A",
"nr_cadastral": 111,
"nr_carte_funciara": "222",
"actualizare_pmb": "2015-01-01",
"editare_admin": "2015-01-01"
}
},
{
"model": "map_app.building",
"pk": 75,
"fields": {
"clasa_categorie": "U1",
"nr_pmb": 13,
"lat": 44.34556,
"long": 26.206,
"loc": "Bucuresti",
"adresa": "Grigore Cobalcescu 401",
"nr_postal": "020244",
"sector": "2",
"nr_sector": 2,
"an_construire": 1901,
"regim_inaltime": "50",
"nr_apart": 2,
"arie_desfasurata": 300.0,
"an_expertiza": 2011,
"expert_atestat": "George Marian",
"obs": "Observatie despre cladirea B",
"nr_cadastral": 222,
"nr_carte_funciara": "333",
"actualizare_pmb": "2015-01-01",
"editare_admin": "2015-01-01"
}
}
},
{
"model": "map_app.building",
"pk": 71,
"fields": {
"clasa_categorie": "5",
"nr_pmb": 4,
"lat": 44.40553,
"long": 26.186,
"loc": "Bucuresti",
"adresa": "Ion Campineanu 300",
"nr_postal": "050277",
"sector": "5",
"nr_sector": 5,
"an_construire": 1904,
"regim_inaltime": "51",
"nr_apart": 3,
"arie_desfasurata": 600.0,
"an_expertiza": 2012,
"expert_atestat": "Ion Vasile",
"obs": "Observatie despre cladirea E",
"nr_cadastral": 555,
"nr_carte_funciara": "666",
"actualizare_pmb": "2016-02-01",
"editare_admin": "2019-01-01"
}
},
{
"model": "map_app.building",
"pk": 72,
"fields": {
"clasa_categorie": "4",
"nr_pmb": 2,
"lat": 44.42556,
"long": 26.176,
"loc": "Bucuresti",
"adresa": "Ioan Filitti 402",
"nr_postal": "040266",
"sector": "4",
"nr_sector": 4,
"an_construire": 1903,
"regim_inaltime": "101",
"nr_apart": 41,
"arie_desfasurata": 500.0,
"an_expertiza": 2002,
"expert_atestat": "George Marian",
"obs": "Observatie despre cladirea D",
"nr_cadastral": 444,
"nr_carte_funciara": "555",
"actualizare_pmb": "2018-01-01",
"editare_admin": "2015-02-01"
}
},
{
"model": "map_app.building",
"pk": 73,
"fields": {
"clasa_categorie": "3",
"nr_pmb": 11,
"lat": 44.39556,
"long": 26.156,
"loc": "Bucuresti",
"adresa": "Ilarie Chendi 404",
"nr_postal": "030255",
"sector": "3",
"nr_sector": 3,
"an_construire": 1902,
"regim_inaltime": "22",
"nr_apart": 21,
"arie_desfasurata": 400.0,
"an_expertiza": 2003,
"expert_atestat": "Ion Vasile",
"obs": "Observatie despre cladirea C",
"nr_cadastral": 333,
"nr_carte_funciara": "444",
"actualizare_pmb": "2019-01-01",
"editare_admin": "2014-01-01"
}
},
{
"model": "map_app.building",
"pk": 74,
"fields": {
"clasa_categorie": "1",
"nr_pmb": 12,
"lat": 44.43556,
"long": 26.106984,
"loc": "Bucuresti",
"adresa": "Radu Cristian 500",
"nr_postal": "010233",
"sector": "1",
"nr_sector": 1,
"an_construire": 1900,
"regim_inaltime": "100",
"nr_apart": 40,
"arie_desfasurata": 200.0,
"an_expertiza": 2001,
"expert_atestat": "Ion Vasile",
"obs": "Observatie despre cladirea A",
"nr_cadastral": 111,
"nr_carte_funciara": "222",
"actualizare_pmb": "2015-01-01",
"editare_admin": "2015-01-01"
}
},
{
"model": "map_app.building",
"pk": 75,
"fields": {
"clasa_categorie": "2",
"nr_pmb": 13,
"lat": 44.34556,
"long": 26.206,
"loc": "Bucuresti",
"adresa": "Grigore Cobalcescu 401",
"nr_postal": "020244",
"sector": "2",
"nr_sector": 2,
"an_construire": 1901,
"regim_inaltime": "50",
"nr_apart": 2,
"arie_desfasurata": 300.0,
"an_expertiza": 2011,
"expert_atestat": "George Marian",
"obs": "Observatie despre cladirea B",
"nr_cadastral": 222,
"nr_carte_funciara": "333",
"actualizare_pmb": "2015-01-01",
"editare_admin": "2015-01-01"
}
}
]
Loading

0 comments on commit a71c4f7

Please sign in to comment.