Skip to content

Commit

Permalink
File upload without Ajax
Browse files Browse the repository at this point in the history
  • Loading branch information
ikerib committed Apr 19, 2017
1 parent 4457ffa commit e9ee5ee
Show file tree
Hide file tree
Showing 48 changed files with 3,523 additions and 1,051 deletions.
24 changes: 24 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
module.exports = {
"env": {
"browser": true
},
"extends": "eslint:recommended",
"rules": {
"indent": [
"error",
4
],
"linebreak-style": [
"error",
"unix"
],
"quotes": [
"error",
"single"
],
"semi": [
"error",
"always"
]
}
};
36 changes: 36 additions & 0 deletions app/Resources/assets/img/PAYUT.jnlp
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Deployment Wizard Build : 11.0.13-B20150330 -->
<jnlp codebase="http://hostdemand.sare.gipuzkoa.net/hod/" href="PAYUT.jnlp">
<information>
<title>IZFE-PAYUT</title>
<vendor>IBM Corporation</vendor>
<description>Host On-Demand</description>
<offline-allowed/>
<shortcut online="true">
<desktop/>
</shortcut>
</information>
<security>
<all-permissions/>
</security>
<resources>
<j2se version="1.3+"/>
<jar href="WSCachedSupporter2.jar" download="eager" main="true"/>
<jar href="CachedAppletInstaller2.jar" download="eager"/>
<property name="jnlp.hod.TrustedJNLP" value="true"/>
<property name="jnlp.hod.WSFrameTitle" value="IZFE-PAYUT"/>
<property name="jnlp.hod.DocumentBase" value="http://hostdemand.sare.gipuzkoa.net/hod/PAYUT.jnlp"/>
<property name="jnlp.hod.PreloadComponentList" value="HABASE;HODBASE;HODIMG;HACP;HAFNTIB;HAFNTAP;HODIMP;HA3270;HODCUT;HAMACUI;HODCFG;HAPD3270;HAKEYMP;HA3270X;HODPOPPAD;HACOLOR;HAKEYPD;HODMAC;HODTLBR;HODZP;HAPRINT;HACLTAU;HODAPPL;HACP1A;HAMACRT;HODSSL;HAXFER;HA_ES"/>
<property name="jnlp.hod.DebugComponents" value="false"/>
<property name="jnlp.hod.DebugCachedClient" value="false"/>
<property name="jnlp.hod.UpgradePromptResponse" value="Background"/>
<property name="jnlp.hod.UpgradePercent" value="100"/>
<property name="jnlp.hod.InstallerFrameWidth" value="550"/>
<property name="jnlp.hod.InstallerFrameHeight" value="350"/>
<property name="jnlp.hod.Locale" value="es_ES"/>
<property name="jnlp.hod.ParameterFile" value="HODData\PAYUT\params.txt"/>
<property name="jnlp.hod.CachedClientSupportedApplet" value="com.ibm.eNetwork.HOD.HostOnDemand"/>
<property name="jnlp.hod.CachedClient" value="true"/>
</resources>
<application-desc main-class="com.ibm.eNetwork.HOD.cached.wssupport.WSCachedSupporter"/>
</jnlp>
Binary file added app/Resources/assets/img/calendar-add.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/Resources/assets/img/calendar-edit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions app/Resources/assets/img/cd-icon-location.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions app/Resources/assets/img/cd-icon-movie.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions app/Resources/assets/img/cd-icon-picture.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/Resources/assets/img/stamp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 17 additions & 17 deletions app/Resources/assets/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@
* Created by iibarguren on 3/13/17.
*/

$( document ).ready(function() {
$(document).ready(function () {

$(document).on('mouseenter', '.page-header', function () {
$('.btnPageHeaderEdit').show();
}).on('mouseleave', '.page-header', function () {
$('.btnPageHeaderEdit').hide();
});
$(document).on('mouseenter', '.page-header', function () {
$('.btnPageHeaderEdit').show()
}).on('mouseleave', '.page-header', function () {
$('.btnPageHeaderEdit').hide()
})

$('#btnGorde').on('click', function() {
$('form').submit();
});
$('#btnGordeModal').on('click', function() {
$('form').submit();
});
$('#btnGorde').on('click', function () {
$('form').submit()
})
$('#btnGordeModal').on('click', function () {
$('form').submit()
})

$('.btnPageHeaderEdit').on('click', function () {
$('#edit-modal').modal();
});
$('.btnPageHeaderEdit').on('click', function () {
$('#edit-modal').modal()
})

$('.dropdown-toggle').dropdown()
$('.dropdown-toggle').dropdown()

});
})
232 changes: 115 additions & 117 deletions app/Resources/assets/js/calendar-admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -264,133 +264,131 @@ $(function () {
}
});

var getAjaxEvents = function () {
var url = Routing.generate('get_events', {'calendarid': $('#calendarid').val()});
return $.ajax({
url: url,
type: "GET",
dataType: "json",
success: function (response) {
var data = [];
if (response.length > 0) {
for (var i = 0; i < response.length; i++) {
var d = {};
d.id = response[i].id;
d.name = response[i].name;
if ("type" in response[i]) {
if ("color" in response[i].type) {
d.color = response[i].type.color;
d.type = response[i].type.id;
}
}
d.hours = parseFloat(response[i].hours);
d.startDate = new Date(response[i].start_date);
d.endDate = new Date(response[i].end_date);
data.push(d);
}
}
return data;
// $('#calendar').data('calendar').setDataSource(data);
},
error: function () {
return -1;
console.log("HORROR!!");
var getAjaxEvents = function () {
var url = Routing.generate('get_events', {'calendarid': $('#calendarid').val()})
return $.ajax({
url: url,
type: 'GET',
dataType: 'json',
success: function (response) {
var data = []
if (response.length > 0) {
for (var i = 0; i < response.length; i++) {
var d = {}
d.id = response[i].id
d.name = response[i].name
if ('type' in response[i]) {
if ('color' in response[i].type) {
d.color = response[i].type.color
d.type = response[i].type.id
}
}

});
};

var getAjaxTemplateEvents = function () {
var tmpl = $('#templateid').val();
if (tmpl === -1) {
console.log("ez du template-rik");
return -1;
d.hours = parseFloat(response[i].hours)
d.startDate = new Date(response[i].start_date)
d.endDate = new Date(response[i].end_date)
data.push(d)
}
}
var url2 = Routing.generate('get_template_events', {'templateid': tmpl});
return $.ajax({
url: url2,
type: "GET",
dataType: "json",
success: function (response) {
var data = [];
if (response.length > 0) {
for (var i = 0; i < response.length; i++) {
var d = {};
d.id = response[i].id;
d.name = response[i].name;
if ("type" in response[i]) {
if ("color" in response[i].type) {
d.color = response[i].type.color;
d.type = response[i].type.id;
}
}
d.hours = parseFloat(response[i].hours);
d.startDate = new Date(response[i].start_date);
d.endDate = new Date(response[i].end_date);
data.push(d);
}
}
// $('#calendar').data('calendar').setDataSource(data);
return data;
},
error: function () {
return -1;
console.log("HORROR!!");
}

});
};

$.when(getAjaxTemplateEvents(), getAjaxEvents()).done(function (a1, a2) {
var resp = [];
// Check if template is set
var tmpl = a1[0];

if (tmpl.length > 0) { // Template is set
for (var i = 0; i < tmpl.length; i++) {
var d = {};
d.id = tmpl[i].id;
d.name = tmpl[i].name;
if ("type" in tmpl[i]) {
if ("color" in tmpl[i].type) {
// d.color = tmpl[i].type.color;
d.color = "#3a4d57";
d.type = tmpl[i].type.id;
}
}
d.hours = parseFloat(tmpl[i].hours);
d.startDate = new Date(tmpl[i].start_date);
d.endDate = new Date(tmpl[i].end_date);
d.istemplate = 1;

resp.push(d);
return data
// $('#calendar').data('calendar').setDataSource(data);
},
error: function () {
return -1
console.log('HORROR!!')
}

})
}

var getAjaxTemplateEvents = function () {
var tmpl = $('#templateid').val()
if (tmpl === -1) {
console.log('ez du template-rik')
return -1
}
var url2 = Routing.generate('get_template_events', {'templateid': tmpl})
return $.ajax({
url: url2,
type: 'GET',
dataType: 'json',
success: function (response) {
var data = []
if (response.length > 0) {
for (var i = 0; i < response.length; i++) {
var d = {}
d.id = response[i].id
d.name = response[i].name
if ('type' in response[i]) {
if ('color' in response[i].type) {
d.color = response[i].type.color
d.type = response[i].type.id
}
}
d.hours = parseFloat(response[i].hours)
d.startDate = new Date(response[i].start_date)
d.endDate = new Date(response[i].end_date)
data.push(d)
}
}
// $('#calendar').data('calendar').setDataSource(data);
return data
},
error: function () {
return -1
console.log('HORROR!!')
}

})
}

$.when(getAjaxTemplateEvents(), getAjaxEvents()).done(function (a1, a2) {
var resp = []
// Check if template is set
var tmpl = a1[0]

if (tmpl.length > 0) { // Template is set
for (var i = 0; i < tmpl.length; i++) {
var d = {}
d.id = tmpl[i].id
d.name = tmpl[i].name
if ('type' in tmpl[i]) {
if ('color' in tmpl[i].type) {
// d.color = tmpl[i].type.color;
d.color = '#3a4d57'
d.type = tmpl[i].type.id
}
}
d.hours = parseFloat(tmpl[i].hours)
d.startDate = new Date(tmpl[i].start_date)
d.endDate = new Date(tmpl[i].end_date)
d.istemplate = 1

var eve = a2[0]; // Events
for (var j = 0; j < eve.length; j++) {
var d2 = {};
d2.id = eve[j].id;
d2.name = eve[j].name;
if ("type" in eve[j]) {
if ("color" in eve[j].type) {
d2.color = eve[j].type.color;
d2.type = eve[j].type.id;
}
}
d2.hours = parseFloat(eve[j].hours);
d2.startDate = new Date(eve[j].start_date);
d2.endDate = new Date(eve[j].end_date);
d2.istemplate = 0;
resp.push(d)
}
}

resp.push(d2);
var eve = a2[0] // Events
for (var j = 0; j < eve.length; j++) {
var d2 = {}
d2.id = eve[j].id
d2.name = eve[j].name
if ('type' in eve[j]) {
if ('color' in eve[j].type) {
d2.color = eve[j].type.color
d2.type = eve[j].type.id
}
}
d2.hours = parseFloat(eve[j].hours)
d2.startDate = new Date(eve[j].start_date)
d2.endDate = new Date(eve[j].end_date)
d2.istemplate = 0

resp.push(d2)
}

$('#calendar').data('calendar').setDataSource(resp);

$('#calendar').data('calendar').setDataSource(resp)

});
})

$('#save-event').on('click', function () {
return saveEvent();
Expand Down
Loading

0 comments on commit e9ee5ee

Please sign in to comment.