Skip to content

Commit

Permalink
remove line space
Browse files Browse the repository at this point in the history
  • Loading branch information
@ny-huynh
ny-huynh committed Jan 5, 2024
1 parent 20fa3dc commit 6593976
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 45 deletions.
4 changes: 0 additions & 4 deletions ups-connector-demo/src_hd/ups/connector/demo/Address/Address.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@
<ui:composition template="/layouts/basic-10.xhtml">
<ui:define name="title">Address</ui:define>
<ui:define name="content">

<h3>Address Validation</h3>
<p>The UPS Address Validation API's database is updated every
month with new address information from USPS. Address Validation for
City, State, Zip is only available for the United States.</p>

<h:form id="form">
<p:growl id="growl" showDetail="false" />
<p:panelGrid columns="2" layout="grid"
Expand Down Expand Up @@ -46,7 +44,6 @@
<p:inputText id="postcodeExtendedLow"
value="#{upsBean.addressKeyFormat.postcodeExtendedLow}" />


<p:outputLabel for="urbanization" value="Urbanization" />
<p:inputText id="urbanization"
value="#{upsBean.addressKeyFormat.urbanization}" />
Expand All @@ -64,7 +61,6 @@
value="Validate" update="form" icon="pi pi-check" />
</div>
</h:form>

</ui:define>
</ui:composition>
</h:body>
Expand Down
6 changes: 0 additions & 6 deletions ups-connector-demo/src_hd/ups/connector/demo/PickupCancel/PickupCancel.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,9 @@
<ui:composition template="/layouts/basic-10.xhtml">
<ui:define name="title">PickupCancel</ui:define>
<ui:define name="content">

<h3>Pickup Cancel</h3>
<p>Using the Pickup API, applications can cancel previously
scheduled pickups.</p>

<h:form id="form">
<p:growl id="growl" showDetail="false" />
<p:panelGrid columns="2" layout="grid"
Expand Down Expand Up @@ -44,9 +42,6 @@
<p:outputLabel for="prn" value="PRN" />
<p:inputText id="prn" value="#{data.prn}" required="true" />
</c:if>



</p:panelGrid>
<br />
<div class="command-btns">
Expand All @@ -56,7 +51,6 @@
value="Cancel Pickup" update="form" icon="pi pi-check" />
</div>
</h:form>

</ui:define>
</ui:composition>
</h:body>
Expand Down
21 changes: 4 additions & 17 deletions ups-connector-demo/src_hd/ups/connector/demo/PickupCreation/PickupCreation.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@
<h3>Pickup Creation</h3>
<p>Using the Pickup API, applications can schedule pickups.</p>
<p:growl />

<h:form id="form">
<p:growl id="growl" showDetail="false" />
<p:growl id="growl" showDetail="false" />
<p:fieldset legend="Shipper Info">
<p:panelGrid columns="5"
styleClass="ui-panelgrid-blank ui-fluid width-100"
Expand All @@ -30,7 +29,6 @@
<p:inputText id="accountCountryCode" required="true"
value="#{data.pickupCreationRequest.shipper.account.accountCountryCode}" />
</p:panelGrid>

</p:fieldset>
<p:fieldset legend="Pickup Date Info" styleClass="mt-8">
<p:panelGrid columns="5"
Expand All @@ -47,11 +45,9 @@

<p:outputLabel for="pickupDate" value="Pickup Date" />
<p:inputText id="pickupDate" required="true"
value="#{data.pickupCreationRequest.pickupDateInfo.pickupDate}" />
value="#{data.pickupCreationRequest.pickupDateInfo.pickupDate}" />
</p:panelGrid>

</p:fieldset>

<p:fieldset legend="Address" styleClass="mt-8">
<p:panelGrid columns="5"
styleClass="ui-panelgrid-blank ui-fluid width-100"
Expand Down Expand Up @@ -117,7 +113,6 @@
<p:inputText id="phoneExtension"
value="#{data.pickupCreationRequest.pickupAddress.phone.extension}" />
</p:panelGrid>

</p:fieldset>
<p:fieldset legend="Pickup Piece" styleClass="mt-8">
<p:panelGrid columns="5"
Expand Down Expand Up @@ -146,7 +141,6 @@
<f:selectItem itemLabel="Pallet" itemValue="03" />
</p:selectOneMenu>
</p:panelGrid>

</p:fieldset>
<p:fieldset legend="Total weight" styleClass="mt-8">
<p:panelGrid columns="5"
Expand All @@ -161,7 +155,6 @@
<p:inputText id="unitOfMeasurement" required="true"
value="#{data.pickupCreationRequest.totalWeight.unitOfMeasurement}" />
</p:panelGrid>

</p:fieldset>
<p:fieldset legend="Other Infomation" styleClass="mt-8">
<p:panelGrid columns="5"
Expand Down Expand Up @@ -220,13 +213,11 @@
</p:fieldset>
<br />
<div class="command-btns">
<p:commandLink id="cancel"
actionListener="#{logic.close}" value="Cancel" />
<p:commandLink id="cancel" actionListener="#{logic.close}"
value="Cancel" />
<p:commandButton id="proceed" actionListener="#{logic.callAPI}"
value="Proceed" update="form" icon="pi pi-check" />
</div>


<c:if test="#{data.pickupCreationResponse ne null}">
<hr />
<h3>Pickup Creation Response</h3>
Expand All @@ -245,14 +236,10 @@
<p:outputLabel for="rateStatus" value="Rate Status" />
<p:inputText id="rateStatus"
value="#{data.pickupCreationResponse.rateStatus.description}" />

</p:panelGrid>

</c:if>
</h:form>

</ui:define>
</ui:composition>
</h:body>

</html>
33 changes: 15 additions & 18 deletions ups-connector-demo/src_hd/ups/connector/demo/TrackDetail/TrackDetail.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,40 +10,41 @@
<ui:composition template="/layouts/basic-10.xhtml">
<ui:define name="title">TrackDetail</ui:define>
<ui:define name="content">

<h3>Get single tracking</h3>
<p>UPS uses tracking numbers to identify and track packages in its system. Applications can use this tracking number to track, locate, and verify arrival of a package. A successful query by tracking number returns information for the specific package within a shipment.
For example, if a package shipment contained four individual packages, the query response would show a shipment containing the one package out of four with the associated tracking number.</p>

<p>UPS uses tracking numbers to identify and track packages in
its system. Applications can use this tracking number to track,
locate, and verify arrival of a package. A successful query by
tracking number returns information for the specific package within
a shipment. For example, if a package shipment contained four
individual packages, the query response would show a shipment
containing the one package out of four with the associated tracking
number.</p>
<h:form id="form">
<p:growl id="growl" showDetail="false" />
<p:panelGrid id="request" columns="2" layout="grid"
styleClass="ui-panelgrid-blank ui-fluid"
columnClasses="ui-g-12 ui-md-3 ui-lg-2, ui-g-12 ui-md-9 ui-lg-4, ui-g-12 ui-md-3 ui-lg-2, ui-g-12 ui-md-9 ui-lg-4">

<p:outputLabel for="inquiryNumber" value="Tracking number" />
<p:inputText id="inquiryNumber"
value="#{data.trackingRequest.inquiryNumber}" required="true"/>
value="#{data.trackingRequest.inquiryNumber}" required="true" />

<p:outputLabel for="locale" value="Locale" />
<p:inputText id="locale" value="#{data.trackingRequest.locale}" />

<p:outputLabel for="transId" value="Trans Id" />
<p:inputText id="transId" value="#{data.trackingRequest.transId}" />


<p:outputLabel for="transactionSrc" value="Transaction Src" />
<p:inputText id="transactionSrc"
value="#{data.trackingRequest.transactionSrc}" />

</p:panelGrid>
<br />
<div class="command-btns">
<p:commandLink id="cancel"
actionListener="#{logic.close}" value="Cancel" immediate="true"/>
<p:commandLink id="cancel" actionListener="#{logic.close}"
value="Cancel" immediate="true" />
<p:commandButton id="search"
actionListener="#{logic.getTracking(data.trackingRequest)}" value="Search"
update="form" icon="pi pi-check" />
actionListener="#{logic.getTracking(data.trackingRequest)}"
value="Search" update="form" icon="pi pi-check" />
</div>
<c:if test="#{data.trackApiResponse.trackResponse ne null}">
<hr />
Expand All @@ -52,7 +53,6 @@
rendered="#{data.trackApiResponse ne null}" columns="2"
layout="grid" styleClass="ui-panelgrid-blank ui-fluid"
columnClasses="ui-g-12 ui-md-3 ui-lg-2, ui-g-12 ui-md-9 ui-lg-4, ui-g-12 ui-md-3 ui-lg-2, ui-g-12 ui-md-9 ui-lg-4">

<p:outputLabel for="inquiryNumber1" value="Tracking Number" />
<p:inputText id="inquiryNumber1"
value="#{data.trackApiResponse.trackResponse.shipment[0].package[0].trackingNumber}" />
Expand All @@ -67,23 +67,20 @@
<p:inputText id="deliveryTime"
value="#{upsBean.getFormatedTime(data.trackApiResponse.trackResponse.shipment[0].package[0].deliveryTime.endTime)}" />
</p:panelGrid>

<h4>Package Activity</h4>
<p:dataTable id="activity" var="activity"
value="#{data.trackApiResponse.trackResponse.shipment[0].package[0].activity}" rendered="#{data.trackApiResponse.trackResponse ne null}">
value="#{data.trackApiResponse.trackResponse.shipment[0].package[0].activity}"
rendered="#{data.trackApiResponse.trackResponse ne null}">
<p:column headerText="Location">
<h:outputText
value="#{activity.location.address.city} #{activity.location.address.country}" />
</p:column>

<p:column headerText="Status">
<h:outputText value="#{activity.status.description}" />
</p:column>

<p:column headerText="Date">
<h:outputText value="#{upsBean.getFormatedDate(activity.date)}" />
</p:column>

<p:column headerText="Time">
<h:outputText value="#{upsBean.getFormatedTime(activity.time)}" />
</p:column>
Expand Down

0 comments on commit 6593976

Please sign in to comment.