Commit e115dd60 authored by Elias Englmeier's avatar Elias Englmeier
Browse files

database changes to accomodate additonal pictures

parent bba403bf
......@@ -60,7 +60,7 @@ $(document).ready(function(){
map.addLayer(loadedMarker);
}
});
map.options.maxZoom = 14;
map.options.maxZoom = 16;
map.fitBounds(markerGroup.getBounds().pad(0.5));
}else{
map.setView([51.312066, 9.492901],12)
......
......@@ -60,7 +60,7 @@ $(document).ready(function(){
map.addLayer(loadedMarker);
}
});
map.options.maxZoom = 14;
map.options.maxZoom = 16;
map.fitBounds(markerGroup.getBounds().pad(0.5));
}else{
map.setView([51.312066, 9.492901],12)
......
......@@ -13,6 +13,6 @@
##
build.namespace=ANALYSIS
build.number=89
build.date=1525420632696
build.number=91
build.date=1529497791995
build.auto.upgrade=true
\ No newline at end of file
......@@ -13,6 +13,6 @@
##
build.namespace=GB
build.number=110
build.date=1525420636990
build.number=112
build.date=1529497796844
build.auto.upgrade=true
\ No newline at end of file
......@@ -561,6 +561,36 @@ public interface IdeasModel extends BaseModel<Ideas>, GroupedModel, ShardedModel
*/
public void setPitch(String pitch);
/**
* Returns the additional pictures of this ideas.
*
* @return the additional pictures of this ideas
*/
@AutoEscape
public String getAdditionalPictures();
/**
* Sets the additional pictures of this ideas.
*
* @param additionalPictures the additional pictures of this ideas
*/
public void setAdditionalPictures(String additionalPictures);
/**
* Returns the additional picture refs of this ideas.
*
* @return the additional picture refs of this ideas
*/
@AutoEscape
public String getAdditionalPictureRefs();
/**
* Sets the additional picture refs of this ideas.
*
* @param additionalPictureRefs the additional picture refs of this ideas
*/
public void setAdditionalPictureRefs(String additionalPictureRefs);
/**
* Returns the status of this ideas.
*
......
......@@ -65,6 +65,8 @@ public class IdeasSoap implements Serializable {
soapModel.setPageUrl(model.getPageUrl());
soapModel.setLayoutRef(model.getLayoutRef());
soapModel.setPitch(model.getPitch());
soapModel.setAdditionalPictures(model.getAdditionalPictures());
soapModel.setAdditionalPictureRefs(model.getAdditionalPictureRefs());
soapModel.setStatus(model.getStatus());
soapModel.setStatusByUserId(model.getStatusByUserId());
soapModel.setStatusByUserName(model.getStatusByUserName());
......@@ -377,6 +379,22 @@ public class IdeasSoap implements Serializable {
_pitch = pitch;
}
public String getAdditionalPictures() {
return _additionalPictures;
}
public void setAdditionalPictures(String additionalPictures) {
_additionalPictures = additionalPictures;
}
public String getAdditionalPictureRefs() {
return _additionalPictureRefs;
}
public void setAdditionalPictureRefs(String additionalPictureRefs) {
_additionalPictureRefs = additionalPictureRefs;
}
public int getStatus() {
return _status;
}
......@@ -440,6 +458,8 @@ public class IdeasSoap implements Serializable {
private String _pageUrl;
private long _layoutRef;
private String _pitch;
private String _additionalPictures;
private String _additionalPictureRefs;
private int _status;
private long _statusByUserId;
private String _statusByUserName;
......
......@@ -90,6 +90,8 @@ public class IdeasWrapper implements Ideas, ModelWrapper<Ideas> {
attributes.put("pageUrl", getPageUrl());
attributes.put("layoutRef", getLayoutRef());
attributes.put("pitch", getPitch());
attributes.put("additionalPictures", getAdditionalPictures());
attributes.put("additionalPictureRefs", getAdditionalPictureRefs());
attributes.put("status", getStatus());
attributes.put("statusByUserId", getStatusByUserId());
attributes.put("statusByUserName", getStatusByUserName());
......@@ -286,6 +288,19 @@ public class IdeasWrapper implements Ideas, ModelWrapper<Ideas> {
setPitch(pitch);
}
String additionalPictures = (String)attributes.get("additionalPictures");
if (additionalPictures != null) {
setAdditionalPictures(additionalPictures);
}
String additionalPictureRefs = (String)attributes.get(
"additionalPictureRefs");
if (additionalPictureRefs != null) {
setAdditionalPictureRefs(additionalPictureRefs);
}
Integer status = (Integer)attributes.get("status");
if (status != null) {
......@@ -516,6 +531,26 @@ public class IdeasWrapper implements Ideas, ModelWrapper<Ideas> {
return new IdeasWrapper((Ideas)_ideas.clone());
}
/**
* Returns the additional picture refs of this ideas.
*
* @return the additional picture refs of this ideas
*/
@Override
public java.lang.String getAdditionalPictureRefs() {
return _ideas.getAdditionalPictureRefs();
}
/**
* Returns the additional pictures of this ideas.
*
* @return the additional pictures of this ideas
*/
@Override
public java.lang.String getAdditionalPictures() {
return _ideas.getAdditionalPictures();
}
/**
* Returns the description of this ideas.
*
......@@ -861,6 +896,26 @@ public class IdeasWrapper implements Ideas, ModelWrapper<Ideas> {
_ideas.persist();
}
/**
* Sets the additional picture refs of this ideas.
*
* @param additionalPictureRefs the additional picture refs of this ideas
*/
@Override
public void setAdditionalPictureRefs(java.lang.String additionalPictureRefs) {
_ideas.setAdditionalPictureRefs(additionalPictureRefs);
}
/**
* Sets the additional pictures of this ideas.
*
* @param additionalPictures the additional pictures of this ideas
*/
@Override
public void setAdditionalPictures(java.lang.String additionalPictures) {
_ideas.setAdditionalPictures(additionalPictures);
}
@Override
public void setCachedModel(boolean cachedModel) {
_ideas.setCachedModel(cachedModel);
......
......@@ -409,6 +409,9 @@ public interface IdeasLocalService extends BaseLocalService,
public long dynamicQueryCount(DynamicQuery dynamicQuery,
Projection projection);
public void addAdditionalPictureToExistingIdea(long ideasId,
long pictureId, java.lang.String pictureRef);
/**
* This is to be replaced or removed as soon as the elevator pitch functionality (Video recording in the browser) has been implemented.
*
......
......@@ -481,6 +481,12 @@ public class IdeasLocalServiceUtil {
return getService().dynamicQueryCount(dynamicQuery, projection);
}
public static void addAdditionalPictureToExistingIdea(long ideasId,
long pictureId, java.lang.String pictureRef) {
getService()
.addAdditionalPictureToExistingIdea(ideasId, pictureId, pictureRef);
}
/**
* This is to be replaced or removed as soon as the elevator pitch functionality (Video recording in the browser) has been implemented.
*
......
......@@ -510,6 +510,13 @@ public class IdeasLocalServiceWrapper implements IdeasLocalService,
return _ideasLocalService.dynamicQueryCount(dynamicQuery, projection);
}
@Override
public void addAdditionalPictureToExistingIdea(long ideasId,
long pictureId, java.lang.String pictureRef) {
_ideasLocalService.addAdditionalPictureToExistingIdea(ideasId,
pictureId, pictureRef);
}
/**
* This is to be replaced or removed as soon as the elevator pitch functionality (Video recording in the browser) has been implemented.
*
......
......@@ -69,6 +69,8 @@
<property name="pageUrl" type="com.liferay.portal.dao.orm.hibernate.StringType" />
<property name="layoutRef" type="com.liferay.portal.dao.orm.hibernate.LongType" />
<property name="pitch" type="com.liferay.portal.dao.orm.hibernate.StringType" />
<property name="additionalPictures" type="com.liferay.portal.dao.orm.hibernate.StringType" />
<property name="additionalPictureRefs" type="com.liferay.portal.dao.orm.hibernate.StringType" />
<property name="status" type="com.liferay.portal.dao.orm.hibernate.IntegerType" />
<property name="statusByUserId" type="com.liferay.portal.dao.orm.hibernate.LongType" />
<property name="statusByUserName" type="com.liferay.portal.dao.orm.hibernate.StringType" />
......
......@@ -82,6 +82,12 @@
<field name="pitch" type="String">
<hint name="max-length">4000</hint>
</field>
<field name="additionalPictures" type="String">
<hint name="max-length">4000</hint>
</field>
<field name="additionalPictureRefs" type="String">
<hint name="max-length">4000</hint>
</field>
<field name="status" type="int" />
<field name="statusByUserId" type="long" />
<field name="statusByUserName" type="String" />
......
......@@ -57,6 +57,8 @@ create table IDEA_Ideas (
pageUrl STRING null,
layoutRef LONG,
pitch STRING null,
additionalPictures STRING null,
additionalPictureRefs STRING null,
status INTEGER,
statusByUserId LONG,
statusByUserName VARCHAR(75) null,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment