Fixed google maps bug, changed size, gardenSize, and price colum names, fixed bug with query review not showing default values
This commit is contained in:
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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 : '';
|
||||
|
||||
|
||||
@@ -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', {
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user