senaduka/old-web
1
0
Fork 0
Code Issues Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Fixed google maps bug, changed size, gardenSize, and price colum names, fixed bug with query review not showing default values

Browse Source
This commit is contained in:
Nedim Uka
2019-05-30 10:43:47 +02:00
parent a0f2b044b2
commit 08a94ca4f8
8 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/gardenSizes.js
View File

@@ -3,17 +3,17 @@ const { getRealEstateTypeEnum } = require('../helpers/enums');
const getGardenSize = (req,res) => {
const rangeFrom = {
min : 0,
min : 10,
max : 3000,
value : 0,
step : 100
step : 10
}
const rangeTo = {
min : 0,
min : 10,
max : 3000,
value : 100,
step : 100
step : 10
}
res.render('gardenSize', { rangeFrom, rangeTo });
};
@@ -26,8 +26,8 @@ const postGardenSize = async (req, res) => {
const realEstateType = getRealEstateTypeEnum(request.realEstateType);
if (realEstateType && realEstateType.hasGardenSize) {
request.gardenSize = req.body.from;
request.gardenSizeRange = req.body.to;
request.gardenSizeMin = req.body.from;
request.gardenSizeMax = req.body.to;
await request.save();
}

8
app/controllers/prices.js
View File

@@ -2,14 +2,14 @@ const { currentRERequest } = require('../helpers/url');
const getPrice = (req,res) => {
const rangeFrom = {
min : 0,
min : 1000,
max : 250000,
value : 0,
step : 1000
}
const rangeTo = {
min : 0,
min : 1000,
max : 250000,
value : 50000,
step : 1000
@@ -25,8 +25,8 @@ const postPrice = async (req, res) => {
const nextStepPage = req.query.nextStep || 'pregled';
const nextStepUrl = `/${nextStepPage}/${request.uniqueId}`;
request.price = req.body.from;
request.priceRange = req.body.to;
request.priceMin = req.body.from;
request.priceMax = req.body.to;
await request.save();
res.redirect(nextStepUrl);

18
app/controllers/queryReview.js
View File

@@ -14,12 +14,12 @@ const getQueryReview = async (req,res) => {
realEstateType,
region,
municipality,
size,
sizeRange,
gardenSize,
gardenSizeRange,
price,
priceRange } = request.dataValues;
sizeMin,
sizeMax,
gardenSizeMin,
gardenSizeMax,
priceMin,
priceMax } = request.dataValues;
const realEstateTypeObject = getRealEstateTypeEnum(realEstateType);
const enableGardenSizeEdit = realEstateTypeObject ? realEstateTypeObject.hasGardenSize : false;
@@ -27,9 +27,9 @@ const getQueryReview = async (req,res) => {
const realEstateTypeTitle = realEstateType ? getEnumTypeTitle(realEstateTypes, realEstateType) : null;
const regionName = region ? getRegionName(region) : null;
const municipalityName = (region && municipality) ? getMunicipalityName(region, municipality) : null;
const sizeTitle = size ? size + "-" + sizeRange + " m2" : null;
const gardenSizeTitle = gardenSize ? gardenSize + "-" + gardenSizeRange + " m2" : null;
const priceTitle = price ? price + "-" + priceRange + " KM" : null;
const sizeTitle = sizeMin ? sizeMin + "-" + sizeMax + " m2" : null;
const gardenSizeTitle = gardenSizeMin ? gardenSizeMin + "-" + gardenSizeMax + " m2" : null;
const priceTitle = priceMin ? priceMin + "-" + priceMax + " KM" : null;
const uniqueId = request.dataValues.uniqueId ? request.dataValues.uniqueId : '';

2
app/controllers/querySubmit.js
View File

@@ -19,7 +19,7 @@ const postQuerySubmit = async (req, res) => {
const emailConfirmInput = req.body.confirm;
let error = "Greška ! Unesite validan email";
if (!isValidEmail(emailInput) || !isValidEmail(emailInput)) {
if (!isValidEmail(emailInput) || !isValidEmail(emailConfirmInput)) {
error = "Greška ! Unesite validan email";
res.render('querySubmit', {

8
app/controllers/sizes.js
View File

@@ -3,14 +3,14 @@ const { sizes, getRealEstateTypeEnum } = require('../helpers/enums');
const getSize = (req,res) => {
const rangeFrom = {
min : 0,
min : 10,
max : 250,
value : 0,
step : 10
}
const rangeTo = {
min : 0,
min : 10,
max : 250,
value : 50,
step : 10
@@ -27,8 +27,8 @@ const postSize = async (req, res) => {
const nextStep = realEstateType && realEstateType.hasGardenSize ? 'okucnica' : 'cijena';
const nextStepPage = req.query.nextStep || nextStep;
const nextStepUrl = `/${nextStepPage}/${request.uniqueId}`;
request.size = req.body.from;
request.sizeRange = req.body.to;
request.sizeMin = req.body.from;
request.sizeMax = req.body.to;
await request.save();
res.redirect(nextStepUrl);

34
app/migrations/20190529133445-range-fields.js → app/migrations/20190530101945-range-fields.js
View File

@@ -8,23 +8,23 @@ module.exports = {
queryInterface.removeColumn('RealEstateRequests', 'size', { transaction: t }),
queryInterface.removeColumn('RealEstateRequests', 'gardenSize', { transaction: t }),
queryInterface.removeColumn('RealEstateRequests', 'price', { transaction: t }),
queryInterface.addColumn('RealEstateRequests', 'sizeRange', {
queryInterface.addColumn('RealEstateRequests', 'gardenSizeMin', {
type: Sequelize.INTEGER,
}, { transaction: t }),
queryInterface.addColumn('RealEstateRequests', 'gardenSizeMax', {
type: Sequelize.INTEGER,
}, { transaction: t }),
queryInterface.addColumn('RealEstateRequests', 'sizeMin', {
type: Sequelize.INTEGER
}, { transaction: t }),
queryInterface.addColumn('RealEstateRequests', 'gardenSizeRange', {
queryInterface.addColumn('RealEstateRequests', 'sizeMax', {
type: Sequelize.INTEGER,
}, { transaction: t }),
queryInterface.addColumn('RealEstateRequests', 'priceRange', {
queryInterface.addColumn('RealEstateRequests', 'priceMin', {
type: Sequelize.INTEGER,
}, { transaction: t }),
queryInterface.addColumn('RealEstateRequests', 'size', {
queryInterface.addColumn('RealEstateRequests', 'priceMax', {
type: Sequelize.INTEGER
}, { transaction: t }),
queryInterface.addColumn('RealEstateRequests', 'gardenSize', {
type: Sequelize.INTEGER,
}, { transaction: t }),
queryInterface.addColumn('RealEstateRequests', 'price', {
type: Sequelize.INTEGER,
}, { transaction: t })
])
})
@@ -33,13 +33,13 @@ module.exports = {
down: (queryInterface, Sequelize) => {
return queryInterface.sequelize.transaction((t) => {
return Promise.all([
queryInterface.removeColumn('RealEstateRequests', 'sizeRange', { transaction: t }),
queryInterface.removeColumn('RealEstateRequests', 'gardenSizeRange', { transaction: t }),
queryInterface.removeColumn('RealEstateRequests', 'priceRange', { transaction: t }),
queryInterface.removeColumn('RealEstateRequests', 'size', { transaction: t }),
queryInterface.removeColumn('RealEstateRequests', 'gardenSize', { transaction: t }),
queryInterface.removeColumn('RealEstateRequests', 'price', { transaction: t }),
queryInterface.addColumn('RealEstateRequests', 'sizeRange', {
queryInterface.removeColumn('RealEstateRequests', 'gardenSizeMin', { transaction: t }),
queryInterface.removeColumn('RealEstateRequests', 'gardenSizeMax', { transaction: t }),
queryInterface.removeColumn('RealEstateRequests', 'sizeMin', { transaction: t }),
queryInterface.removeColumn('RealEstateRequests', 'sizeMax', { transaction: t }),
queryInterface.removeColumn('RealEstateRequests', 'priceMin', { transaction: t }),
queryInterface.removeColumn('RealEstateRequests', 'priceMin', { transaction: t }),
queryInterface.addColumn('RealEstateRequests', 'priceMax', {
type: Sequelize.STRING
}, { transaction: t }),
queryInterface.addColumn('RealEstateRequests', 'gardenSizeRange', {

12
app/models/realestaterequest.js
View File

@@ -12,12 +12,12 @@ module.exports = (sequelize, DataTypes) => {
email: DataTypes.STRING,
region: DataTypes.STRING,
municipality: DataTypes.STRING,
size: DataTypes.INTEGER,
sizeRange: DataTypes.INTEGER,
gardenSize: DataTypes.INTEGER,
gardenSizeRange: DataTypes.INTEGER,
price: DataTypes.INTEGER,
priceRange: DataTypes.INTEGER,
sizeMin: DataTypes.INTEGER,
sizeMax: DataTypes.INTEGER,
gardenSizeMin: DataTypes.INTEGER,
gardenSizeMax: DataTypes.INTEGER,
priceMin: DataTypes.INTEGER,
priceMax: DataTypes.INTEGER,
bounding_box: DataTypes.GEOMETRY('POINT', 4326)
}, {});
RealEstateRequest.associate = function(models) {

8
app/views/neighborhoodMap.ejs
View File

@@ -73,10 +73,10 @@
$("#btnsubmit").click(() => {
var bounds = map.getBounds();
$("#north").val(bounds.na.l);
$("#south").val(bounds.na.j);
$("#east").val(bounds.ia.l);
$("#west").val(bounds.ia.j);
$("#north").val(map.getBounds().getNorthEast().lat());
$("#south").val(map.getBounds().getSouthWest().lat());
$("#east").val(map.getBounds().getNorthEast().lng());
$("#west").val(map.getBounds().getSouthWest().lng());
$("#form-map-output").submit();
});