Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions src/main/jasperreports/ticket/ticket_bg.jrxml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<defaultValueExpression><![CDATA["ДжейПрайм Ивентс ООД <conference@jprime.io>"]]></defaultValueExpression>
</parameter>
<parameter name="event" class="java.lang.String">
<defaultValueExpression><![CDATA["JPrime 2025"]]></defaultValueExpression>
<defaultValueExpression><![CDATA["JPrime 2026"]]></defaultValueExpression>
</parameter>
<parameter name="location" class="java.lang.String">
<defaultValueExpression><![CDATA["Иновационен форум \"Джон Атанасофф\" в София Тех Парк"]]></defaultValueExpression>
</parameter>
<parameter name="dateTime" class="java.lang.String">
<defaultValueExpression><![CDATA["14 и 15Май 2025"]]></defaultValueExpression>
<defaultValueExpression><![CDATA["3 и 4Юни 2026"]]></defaultValueExpression>
</parameter>
<queryString>
<![CDATA[]]>
Expand All @@ -30,10 +30,10 @@
</band>
</title>
<pageHeader>
<band height="243" splitType="Stretch">
<band height="286" splitType="Stretch">
<property name="com.jaspersoft.studio.unit.height" value="px"/>
<image scaleImage="RetainShape">
<reportElement x="0" y="0" width="550" height="240" uuid="e9f0a62d-e04e-4619-a688-5d6ebb6a1364"/>
<image scaleImage="RetainShape" hAlign="Center" vAlign="Middle">
<reportElement x="0" y="0" width="550" height="286" uuid="e9f0a62d-e04e-4619-a688-5d6ebb6a1364"/>
<imageExpression><![CDATA[$P{logoStream}]]></imageExpression>
</image>
</band>
Expand All @@ -48,7 +48,7 @@
<staticText>
<reportElement x="170" y="0" width="220" height="23" uuid="64725e36-aee1-4998-a181-8301fc227845"/>
<textElement textAlignment="Center">
<font size="16"/>
<font fontName="SansSerif" size="16" isItalic="true"/>
</textElement>
<text><![CDATA[Информация за събитието]]></text>
</staticText>
Expand All @@ -65,7 +65,7 @@
<staticText>
<reportElement x="240" y="158" width="80" height="23" uuid="d9096617-583c-46ab-af3a-bde67fa2bb4f"/>
<textElement textAlignment="Center">
<font size="16"/>
<font fontName="SansSerif" size="16" isItalic="true"/>
</textElement>
<text><![CDATA[Билет]]></text>
</staticText>
Expand All @@ -82,28 +82,28 @@
<staticText>
<reportElement x="0" y="27" width="101" height="21" uuid="22363617-cea9-4fa6-8e3a-81c7d92d858a"/>
<textElement textAlignment="Right">
<font size="14"/>
<font fontName="SansSerif" size="14" isItalic="true"/>
</textElement>
<text><![CDATA[Дата/Час]]></text>
</staticText>
<staticText>
<reportElement x="0" y="73" width="101" height="21" uuid="e8ad71ac-808d-43f8-a7f7-1729d69e39f4"/>
<textElement textAlignment="Right">
<font size="14"/>
<font fontName="SansSerif" size="14" isItalic="true"/>
</textElement>
<text><![CDATA[Къде]]></text>
</staticText>
<staticText>
<reportElement x="0" y="120" width="102" height="20" uuid="4dfb651d-8e2f-42b4-8e0c-e70c68568e99"/>
<textElement textAlignment="Right">
<font size="14"/>
<font fontName="SansSerif" size="14" isItalic="true"/>
</textElement>
<text><![CDATA[Организатор]]></text>
</staticText>
<staticText>
<reportElement x="0" y="187" width="130" height="21" uuid="2cd26d70-cd88-452f-90ae-e4003b94090d"/>
<textElement textAlignment="Right">
<font size="14"/>
<font fontName="SansSerif" size="14" isItalic="true"/>
</textElement>
<text><![CDATA[Държател]]></text>
</staticText>
Expand All @@ -112,7 +112,7 @@
<property name="com.jaspersoft.studio.unit.height" value="px"/>
</reportElement>
<textElement textAlignment="Right">
<font size="14"/>
<font fontName="SansSerif" size="14" isItalic="true"/>
</textElement>
<text><![CDATA[Тип]]></text>
</staticText>
Expand All @@ -121,7 +121,7 @@
<property name="com.jaspersoft.studio.unit.height" value="px"/>
</reportElement>
<textElement textAlignment="Right">
<font size="14"/>
<font fontName="SansSerif" size="14" isItalic="true"/>
</textElement>
<text><![CDATA[Номер]]></text>
</staticText>
Expand All @@ -134,14 +134,14 @@
<textField textAdjust="StretchHeight">
<reportElement x="140" y="181" width="411" height="33" uuid="a34b4433-1f17-43c7-a6c0-f1c907e4c797"/>
<textElement verticalAlignment="Middle">
<font size="14"/>
<font fontName="SansSerif" size="14" isItalic="true"/>
</textElement>
<textFieldExpression><![CDATA[$F{holder}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="130" y="21" width="241" height="33" uuid="5c2fcc39-a15f-4ee8-a4ce-c10347d8f563"/>
<textElement verticalAlignment="Middle">
<font size="14"/>
<font fontName="SansSerif" size="14" isItalic="true"/>
</textElement>
<textFieldExpression><![CDATA[$P{dateTime}]]></textFieldExpression>
</textField>
Expand All @@ -150,7 +150,7 @@
<property name="com.jaspersoft.studio.unit.height" value="px"/>
</reportElement>
<textElement verticalAlignment="Middle">
<font size="14"/>
<font fontName="SansSerif" size="14" isItalic="true"/>
</textElement>
<textFieldExpression><![CDATA[$P{location}]]></textFieldExpression>
</textField>
Expand All @@ -159,21 +159,21 @@
<property name="com.jaspersoft.studio.unit.height" value="px"/>
</reportElement>
<textElement verticalAlignment="Middle">
<font size="14"/>
<font fontName="SansSerif" size="14" isItalic="true"/>
</textElement>
<textFieldExpression><![CDATA[$P{organizer}]]></textFieldExpression>
</textField>
<textField textAdjust="StretchHeight">
<reportElement x="140" y="222" width="411" height="32" uuid="0dd27fa0-7501-48a5-87b7-879f264416cc"/>
<textElement verticalAlignment="Middle">
<font size="14"/>
<font fontName="SansSerif" size="14" isItalic="true"/>
</textElement>
<textFieldExpression><![CDATA[$F{type}]]></textFieldExpression>
</textField>
<textField textAdjust="StretchHeight">
<reportElement x="139" y="264" width="411" height="31" uuid="2f78e751-5e0f-4111-b7db-5dbe83e9c912"/>
<textElement verticalAlignment="Middle">
<font size="14"/>
<font fontName="SansSerif" size="14" isItalic="true"/>
</textElement>
<textFieldExpression><![CDATA[$F{number}]]></textFieldExpression>
</textField>
Expand All @@ -190,7 +190,7 @@
<staticText>
<reportElement x="180" y="0" width="200" height="23" uuid="5386da21-7583-4e2c-b3f0-7fff44621f28"/>
<textElement textAlignment="Center">
<font size="16"/>
<font fontName="SansSerif" size="16" isItalic="true"/>
</textElement>
<text><![CDATA[Условия за участие]]></text>
</staticText>
Expand All @@ -206,10 +206,10 @@
</line>
<textField>
<reportElement x="10" y="24" width="541" height="171" uuid="42e98d14-6d53-4e89-9c50-0339068c0b1d"/>
<textElement markup="styled"/>
<textFieldExpression><![CDATA["Participation in <style isBold=\"true\">JPrime 2025</style> entails acceptance of the Conditions for participation. This Ticket allows you to collect only ONE Badge. Lost or forgotten badges are not replaced! The organization does not take back any badges. Wearing an identification badge is mandatory to access the Conference space, as well as the Exhibition space. Anyone without a badge will be denied access to <style isBold=\"true\">JPrime 2025</style>.\n" +
"In the event of excessive attendance, and for security reasons, the organizers reserve the right to prohibit access to the rooms. The internal rules of the venue space apply without reservation to all participants (no smoking in the venue).The organizers reserve the right to definitively exclude any person, without this giving the right to a refund, whose behavior or attitude is deemed unacceptable.\n" +
"<style isBold=\"true\">JPrime 2025</style> is organized in an open spirit that allows everyone to participate. The organizers are vigilant about the smooth running of the conference. The speakers are informed that their presentation should not shock and respect all the participants. Any breach of propriety, or any event likely to disrupt the conference can be reported immediately to the organizers present on the site or by email at <style isBold=\"true\">conference@jprime.io</style>"]]></textFieldExpression>
<textElement markup="styled">
<font fontName="SansSerif" size="10"/>
</textElement>
<textFieldExpression><![CDATA["We will provide you with ONE badge for the two days. You have to wear the Badge all the time while you are at the <style isBold=\"true\">JPrime 2026</style> Conference venue! You will not be allowed to enter the <style isBold=\"true\">JPrime 2026</style> conference rooms without a Badge."]]></textFieldExpression>
</textField>
</band>
</pageFooter>
Expand Down
6 changes: 3 additions & 3 deletions src/main/jasperreports/ticket/ticket_en.jrxml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<defaultValueExpression><![CDATA["JPrime Events <conference@jprime.io>"]]></defaultValueExpression>
</parameter>
<parameter name="event" class="java.lang.String">
<defaultValueExpression><![CDATA["JPrime 2025"]]></defaultValueExpression>
<defaultValueExpression><![CDATA["JPrime 2026"]]></defaultValueExpression>
</parameter>
<parameter name="location" class="java.lang.String">
<defaultValueExpression><![CDATA["\"John Atanasoff\" Innovation forum in Sofia Tech Park"]]></defaultValueExpression>
</parameter>
<parameter name="dateTime" class="java.lang.String">
<defaultValueExpression><![CDATA["14-15 of May 2025"]]></defaultValueExpression>
<defaultValueExpression><![CDATA["3–4 of June 2026"]]></defaultValueExpression>
</parameter>
<queryString>
<![CDATA[]]>
Expand Down Expand Up @@ -209,7 +209,7 @@
<textElement markup="styled">
<font fontName="SansSerif" size="10"/>
</textElement>
<textFieldExpression><![CDATA["We will provide you with TWO badges for the two days. You have to wear the Badge all the time while you are at the <style isBold=\"true\">JPrime 2025</style> Conference venue! You will not be allowed to enter the <style isBold=\"true\">JPrime 2025</style> conference rooms without a Badge."]]></textFieldExpression>
<textFieldExpression><![CDATA["We will provide you with ONE badge for the two days. You have to wear the Badge all the time while you are at the <style isBold=\"true\">JPrime 2026</style> Conference venue! You will not be allowed to enter the <style isBold=\"true\">JPrime 2026</style> conference rooms without a Badge."]]></textFieldExpression>
</textField>
</band>
</pageFooter>
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/site/controller/invoice/InvoiceExporter.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import java.io.InputStream;
import java.lang.reflect.InvocationTargetException;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayList;
Expand All @@ -23,7 +22,6 @@

import site.facade.BranchService;
import site.model.Branch;
import site.model.TicketPrice;

import static org.apache.commons.beanutils.PropertyUtils.getProperty;

Expand Down Expand Up @@ -96,7 +94,7 @@ public static void main(String[] args) throws Exception {
data.setInvoiceType("Проформа");
data.setPaymentType("пеймънт");

String description = "jPrime 2025 билет за конференция";
String description = "JPrime 2026 билет за конференция";

BigDecimal singlePriceWithVAT_Student = BigDecimal.valueOf(65.0);
BigDecimal singlePriceWithVAT_Regular = BigDecimal.valueOf(170.0);
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/site/controller/ticket/TicketExporter.java
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public byte[] exportTicket(TicketData data, InvoiceLanguage language) {
throw new RuntimeException(e);
}

InputStream logoStream = getClass().getResourceAsStream("/ticket/jprime_ticket_logo_2025.svg");
InputStream logoStream = getClass().getResourceAsStream("/ticket/jprime_ticket_logo_2026.png");

Map<String, Object> parameters = new HashMap<>();
parameters.put("logoStream", logoStream);
Expand Down Expand Up @@ -113,13 +113,13 @@ public byte[] exportTicket(TicketData data, InvoiceLanguage language) {
}
}

//demonstration purposes only!
//for demonstration purposes only!
public static void main(String[] args) throws Exception {
TicketData data = new TicketData();
data.setOrganizer("JPrime Events");
data.setEvent("JPrime " + "2025");
data.setEvent("JPrime " + "2026");
data.addDetail(new TicketDetail(UUID.randomUUID().toString(), "Doychin Bondzhev", "Organizer"));
data.addDetail(new TicketDetail(UUID.randomUUID().toString(), "Iva Bondzheva", "Volunteer"));
data.addDetail(new TicketDetail(UUID.randomUUID().toString(), "Denislava Bondzheva", "Volunteer"));
data.addDetail(new TicketDetail(UUID.randomUUID().toString(), "Hristo Kolev", "Visitor - Sponsored"));
data.addDetail(new TicketDetail(UUID.randomUUID().toString(), "Venkat Subramaniam", "Speaker"));

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 4 additions & 3 deletions src/main/webapp/tickets-register.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
<div class="container">
<div class="row">
<div class="col-12">
<p>
<h2>Buy conference tickets</h2>
<p>
<%-- <p style="text-decoration: line-through;"> --%>
Expand Down Expand Up @@ -120,7 +119,7 @@
<form:hidden path="id"/>
<p>
<c:url var="captchaUrl" value="/captcha-image"/>
<img src="${captchaUrl}"/>
<img src="${captchaUrl}" alt="captcha"/>
<form:input path="captcha"/>
<form:errors path="captcha"/>
</p>
Expand Down Expand Up @@ -161,7 +160,6 @@
<%--</form>--%>

<p>In case of questions, contact us at <a href="mailto:conference@jprime.io">conference@jprime.io</a>.</p>
</p>
</div>
</div>
</div>
Expand Down Expand Up @@ -228,14 +226,17 @@
case 0:
$(this).attr("id", "visitors" + index + ".name");
$(this).attr("name", "visitors[" + index + "].name");
$(this).val("");
break;
case 1:
$(this).attr("id", "visitors" + index + ".email");
$(this).attr("name", "visitors[" + index + "].email");
$(this).val("");
break;
case 2:
$(this).attr("id", "visitors" + index + ".company");
$(this).attr("name", "visitors[" + index + "].company");
$(this).val("");
break;
}
});
Expand Down
Loading