Imanol-Mikel Barba Sabariego / btvendor · Commits

Commit 20a8711d3fc8e50427683c448ed02458e1ce5518

Authored by Imanol-Mikel Barba Sabariego
1 parent 515dfc5d

--no commit message

Inline Side-by-side
Showing 13 changed files with 439 additions and 35 deletions
DUREX Vendor Control/DateRangePickerViewController.xib renamed to DUREX Vendor Control/Base.lproj/DateRangePickerViewController.xib
  View file @20a8711
@@ -7,9 +7,13 @@ @@ -7,9 +7,13 @@
7 <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="DateRangePickerViewController"> 7 <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="DateRangePickerViewController">
8 <connections> 8 <connections>
9 <outlet property="dateRangePickerView" destination="fz9-NP-VLV" id="SCJ-Kj-RVG"/> 9 <outlet property="dateRangePickerView" destination="fz9-NP-VLV" id="SCJ-Kj-RVG"/>
  10 + <outlet property="doneButton" destination="aYc-3W-Uqn" id="ewN-ug-nXe"/>
10 <outlet property="fromDate" destination="P5u-F4-X4a" id="O8W-IK-kwx"/> 11 <outlet property="fromDate" destination="P5u-F4-X4a" id="O8W-IK-kwx"/>
11 <outlet property="fromToggler" destination="gUl-8z-CPz" id="cxE-U3-SjF"/> 12 <outlet property="fromToggler" destination="gUl-8z-CPz" id="cxE-U3-SjF"/>
  13 + <outlet property="scrollView" destination="fz9-NP-VLV" id="Sx5-C6-Iaf"/>
  14 + <outlet property="scrolledView" destination="bPF-XH-a36" id="dvl-JE-CqD"/>
12 <outlet property="toDate" destination="mwj-Ys-4vf" id="gNf-g2-mOs"/> 15 <outlet property="toDate" destination="mwj-Ys-4vf" id="gNf-g2-mOs"/>
  16 + <outlet property="toLabel" destination="J6Y-lM-Rjf" id="i3Y-ZN-10S"/>
13 <outlet property="toToggler" destination="IjI-S6-otK" id="L9P-kq-pcF"/> 17 <outlet property="toToggler" destination="IjI-S6-otK" id="L9P-kq-pcF"/>
14 <outlet property="view" destination="kvr-be-fbh" id="KCt-Co-8O9"/> 18 <outlet property="view" destination="kvr-be-fbh" id="KCt-Co-8O9"/>
15 </connections> 19 </connections>
@@ -20,10 +24,10 @@ @@ -20,10 +24,10 @@
20 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> 24 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
21 <subviews> 25 <subviews>
22 <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fz9-NP-VLV"> 26 <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fz9-NP-VLV">
23 - <rect key="frame" x="0.0" y="70" width="320" height="340"/> 27 + <rect key="frame" x="0.0" y="70" width="320" height="137"/>
24 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> 28 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
25 <subviews> 29 <subviews>
26 - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bPF-XH-a36"> 30 + <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bPF-XH-a36">
27 <rect key="frame" x="0.0" y="0.0" width="320" height="602"/> 31 <rect key="frame" x="0.0" y="0.0" width="320" height="602"/>
28 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> 32 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
29 <subviews> 33 <subviews>
@@ -47,7 +51,7 @@ @@ -47,7 +51,7 @@
47 <!--2014-09-13 01:58:25 +0000--> 51 <!--2014-09-13 01:58:25 +0000-->
48 </date> 52 </date>
49 <timeZone key="timeZone" name="America/Los_Angeles"> 53 <timeZone key="timeZone" name="America/Los_Angeles">
50 - <mutableData key="data"> 54 + <data key="data">
51 VFppZgAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAAAAAC5AAAABAAAABCepkign7sVkKCGKqChmveQ 55 VFppZgAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAAAAAC5AAAABAAAABCepkign7sVkKCGKqChmveQ
52 y4kaoNIj9HDSYSYQ1v50INiArZDa/tGg28CQENzes6DdqayQ3r6VoN+JjpDgnneg4WlwkOJ+WaDjSVKQ 56 y4kaoNIj9HDSYSYQ1v50INiArZDa/tGg28CQENzes6DdqayQ3r6VoN+JjpDgnneg4WlwkOJ+WaDjSVKQ
53 5F47oOUpNJDmR1gg5xJREOgnOiDo8jMQ6gccIOrSFRDr5v4g7LH3EO3G4CDukdkQ76/8oPBxuxDxj96g 57 5F47oOUpNJDmR1gg5xJREOgnOiDo8jMQ6gccIOrSFRDr5v4g7LH3EO3G4CDukdkQ76/8oPBxuxDxj96g
@@ -65,30 +69,30 @@ f5gqkAABAAECAwEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA @@ -65,30 +69,30 @@ f5gqkAABAAECAwEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
65 AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA 69 AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
66 AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA 70 AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
67 AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA 71 AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
68 -</mutableData> 72 +</data>
69 </timeZone> 73 </timeZone>
70 </datePicker> 74 </datePicker>
71 - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="To:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J6Y-lM-Rjf">  
72 - <rect key="frame" x="20" y="234" width="23" height="31"/> 75 + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="To:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J6Y-lM-Rjf">
  76 + <rect key="frame" x="20" y="64" width="23" height="21"/>
73 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> 77 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
74 <fontDescription key="fontDescription" type="system" pointSize="17"/> 78 <fontDescription key="fontDescription" type="system" pointSize="17"/>
75 <nil key="highlightedColor"/> 79 <nil key="highlightedColor"/>
76 </label> 80 </label>
77 <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="IjI-S6-otK"> 81 <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="IjI-S6-otK">
78 - <rect key="frame" x="51" y="229" width="51" height="31"/> 82 + <rect key="frame" x="51" y="59" width="51" height="31"/>
79 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> 83 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
80 <connections> 84 <connections>
81 <action selector="toggleToDate:" destination="-1" eventType="valueChanged" id="JNu-fd-64c"/> 85 <action selector="toggleToDate:" destination="-1" eventType="valueChanged" id="JNu-fd-64c"/>
82 </connections> 86 </connections>
83 </switch> 87 </switch>
84 - <datePicker hidden="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="mwj-Ys-4vf">  
85 - <rect key="frame" x="0.0" y="268" width="320" height="162"/> 88 + <datePicker hidden="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="mwj-Ys-4vf">
  89 + <rect key="frame" x="0.0" y="98" width="320" height="162"/>
86 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> 90 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
87 <date key="date" timeIntervalSinceReferenceDate="432266362.26397198"> 91 <date key="date" timeIntervalSinceReferenceDate="432266362.26397198">
88 <!--2014-09-13 01:59:22 +0000--> 92 <!--2014-09-13 01:59:22 +0000-->
89 </date> 93 </date>
90 <timeZone key="timeZone" name="America/Los_Angeles"> 94 <timeZone key="timeZone" name="America/Los_Angeles">
91 - <mutableData key="data"> 95 + <data key="data">
92 VFppZgAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAAAAAC5AAAABAAAABCepkign7sVkKCGKqChmveQ 96 VFppZgAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAAAAAC5AAAABAAAABCepkign7sVkKCGKqChmveQ
93 y4kaoNIj9HDSYSYQ1v50INiArZDa/tGg28CQENzes6DdqayQ3r6VoN+JjpDgnneg4WlwkOJ+WaDjSVKQ 97 y4kaoNIj9HDSYSYQ1v50INiArZDa/tGg28CQENzes6DdqayQ3r6VoN+JjpDgnneg4WlwkOJ+WaDjSVKQ
94 5F47oOUpNJDmR1gg5xJREOgnOiDo8jMQ6gccIOrSFRDr5v4g7LH3EO3G4CDukdkQ76/8oPBxuxDxj96g 98 5F47oOUpNJDmR1gg5xJREOgnOiDo8jMQ6gccIOrSFRDr5v4g7LH3EO3G4CDukdkQ76/8oPBxuxDxj96g
@@ -106,11 +110,11 @@ f5gqkAABAAECAwEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA @@ -106,11 +110,11 @@ f5gqkAABAAECAwEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
106 AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA 110 AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
107 AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA 111 AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
108 AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA 112 AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
109 -</mutableData> 113 +</data>
110 </timeZone> 114 </timeZone>
111 </datePicker> 115 </datePicker>
112 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aYc-3W-Uqn"> 116 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aYc-3W-Uqn">
113 - <rect key="frame" x="137" y="438" width="37" height="30"/> 117 + <rect key="frame" x="142" y="97" width="37" height="30"/>
114 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> 118 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
115 <state key="normal" title="Done"> 119 <state key="normal" title="Done">
116 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> 120 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -122,41 +126,34 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA @@ -122,41 +126,34 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
122 </subviews> 126 </subviews>
123 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> 127 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
124 <constraints> 128 <constraints>
  129 + <constraint firstItem="aYc-3W-Uqn" firstAttribute="leading" secondItem="bPF-XH-a36" secondAttribute="leading" constant="142" id="012-bb-lhx"/>
125 <constraint firstAttribute="centerX" secondItem="P5u-F4-X4a" secondAttribute="centerX" id="3kI-JI-Z1h"/> 130 <constraint firstAttribute="centerX" secondItem="P5u-F4-X4a" secondAttribute="centerX" id="3kI-JI-Z1h"/>
  131 + <constraint firstItem="IjI-S6-otK" firstAttribute="top" secondItem="gUl-8z-CPz" secondAttribute="bottom" constant="8" id="52l-FN-K2C"/>
126 <constraint firstAttribute="height" constant="602" id="9TX-1i-78Z"/> 132 <constraint firstAttribute="height" constant="602" id="9TX-1i-78Z"/>
127 - <constraint firstItem="IjI-S6-otK" firstAttribute="top" secondItem="P5u-F4-X4a" secondAttribute="bottom" constant="8" id="F2V-Vc-2cb"/> 133 + <constraint firstAttribute="centerX" secondItem="aYc-3W-Uqn" secondAttribute="centerX" constant="-0.5" id="Ad7-EA-luE"/>
  134 + <constraint firstItem="J6Y-lM-Rjf" firstAttribute="top" secondItem="xIo-vd-lE7" secondAttribute="bottom" constant="18" id="Ebo-Ll-h52"/>
128 <constraint firstItem="gUl-8z-CPz" firstAttribute="leading" secondItem="xIo-vd-lE7" secondAttribute="trailing" constant="8" id="GGW-gp-gX0"/> 135 <constraint firstItem="gUl-8z-CPz" firstAttribute="leading" secondItem="xIo-vd-lE7" secondAttribute="trailing" constant="8" id="GGW-gp-gX0"/>
  136 + <constraint firstItem="aYc-3W-Uqn" firstAttribute="top" secondItem="IjI-S6-otK" secondAttribute="bottom" constant="7" id="HEf-k7-g2Z"/>
129 <constraint firstAttribute="width" constant="320" id="HeC-5b-Jcm"/> 137 <constraint firstAttribute="width" constant="320" id="HeC-5b-Jcm"/>
130 <constraint firstItem="xIo-vd-lE7" firstAttribute="top" secondItem="bPF-XH-a36" secondAttribute="top" constant="25" id="Lre-tN-KLY"/> 138 <constraint firstItem="xIo-vd-lE7" firstAttribute="top" secondItem="bPF-XH-a36" secondAttribute="top" constant="25" id="Lre-tN-KLY"/>
131 - <constraint firstItem="mwj-Ys-4vf" firstAttribute="top" secondItem="J6Y-lM-Rjf" secondAttribute="bottom" constant="13" id="QFK-8l-qS9"/>  
132 <constraint firstItem="IjI-S6-otK" firstAttribute="leading" secondItem="J6Y-lM-Rjf" secondAttribute="trailing" constant="8" id="SiP-L0-vna"/> 139 <constraint firstItem="IjI-S6-otK" firstAttribute="leading" secondItem="J6Y-lM-Rjf" secondAttribute="trailing" constant="8" id="SiP-L0-vna"/>
133 <constraint firstItem="xIo-vd-lE7" firstAttribute="leading" secondItem="bPF-XH-a36" secondAttribute="leading" constant="20" id="UYd-kA-RVe"/> 140 <constraint firstItem="xIo-vd-lE7" firstAttribute="leading" secondItem="bPF-XH-a36" secondAttribute="leading" constant="20" id="UYd-kA-RVe"/>
134 - <constraint firstItem="J6Y-lM-Rjf" firstAttribute="top" secondItem="P5u-F4-X4a" secondAttribute="bottom" constant="13" id="W89-jA-XLF"/>  
135 - <constraint firstItem="aYc-3W-Uqn" firstAttribute="leading" secondItem="bPF-XH-a36" secondAttribute="leading" constant="137" id="aYI-pb-BGP"/>  
136 <constraint firstItem="P5u-F4-X4a" firstAttribute="top" secondItem="gUl-8z-CPz" secondAttribute="bottom" constant="8" id="cA8-yk-fVJ"/> 141 <constraint firstItem="P5u-F4-X4a" firstAttribute="top" secondItem="gUl-8z-CPz" secondAttribute="bottom" constant="8" id="cA8-yk-fVJ"/>
137 <constraint firstItem="J6Y-lM-Rjf" firstAttribute="leading" secondItem="bPF-XH-a36" secondAttribute="leading" constant="20" id="jXK-cV-gUA"/> 142 <constraint firstItem="J6Y-lM-Rjf" firstAttribute="leading" secondItem="bPF-XH-a36" secondAttribute="leading" constant="20" id="jXK-cV-gUA"/>
138 <constraint firstItem="P5u-F4-X4a" firstAttribute="top" secondItem="xIo-vd-lE7" secondAttribute="bottom" constant="13" id="jfl-Gt-5hY"/> 143 <constraint firstItem="P5u-F4-X4a" firstAttribute="top" secondItem="xIo-vd-lE7" secondAttribute="bottom" constant="13" id="jfl-Gt-5hY"/>
139 - <constraint firstItem="aYc-3W-Uqn" firstAttribute="top" secondItem="mwj-Ys-4vf" secondAttribute="bottom" constant="8" id="k8t-h6-GS2"/>  
140 - <constraint firstItem="mwj-Ys-4vf" firstAttribute="top" secondItem="IjI-S6-otK" secondAttribute="bottom" constant="8" id="n0B-8A-b9s"/>  
141 <constraint firstAttribute="centerX" secondItem="mwj-Ys-4vf" secondAttribute="centerX" id="vvq-Wh-sPa"/> 144 <constraint firstAttribute="centerX" secondItem="mwj-Ys-4vf" secondAttribute="centerX" id="vvq-Wh-sPa"/>
142 <constraint firstItem="gUl-8z-CPz" firstAttribute="top" secondItem="bPF-XH-a36" secondAttribute="top" constant="20" id="wxd-X3-cbH"/> 145 <constraint firstItem="gUl-8z-CPz" firstAttribute="top" secondItem="bPF-XH-a36" secondAttribute="top" constant="20" id="wxd-X3-cbH"/>
143 </constraints> 146 </constraints>
144 </view> 147 </view>
145 </subviews> 148 </subviews>
146 <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="calibratedWhite"/> 149 <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="calibratedWhite"/>
147 - <constraints>  
148 - <constraint firstAttribute="bottom" secondItem="bPF-XH-a36" secondAttribute="bottom" id="0Bb-cL-qKB"/>  
149 - <constraint firstAttribute="trailing" secondItem="bPF-XH-a36" secondAttribute="trailing" id="GAG-Q1-iFr"/>  
150 - <constraint firstItem="bPF-XH-a36" firstAttribute="leading" secondItem="fz9-NP-VLV" secondAttribute="leading" id="I3Y-5Z-L9J"/>  
151 - <constraint firstItem="bPF-XH-a36" firstAttribute="top" secondItem="fz9-NP-VLV" secondAttribute="top" id="lZu-uv-29b"/>  
152 - </constraints>  
153 </scrollView> 150 </scrollView>
154 </subviews> 151 </subviews>
155 <color key="backgroundColor" red="0.023529414089999999" green="0.0039215688589999999" blue="0.0039215688589999999" alpha="0.5" colorSpace="deviceRGB"/> 152 <color key="backgroundColor" red="0.023529414089999999" green="0.0039215688589999999" blue="0.0039215688589999999" alpha="0.5" colorSpace="deviceRGB"/>
156 <constraints> 153 <constraints>
157 <constraint firstItem="fz9-NP-VLV" firstAttribute="top" secondItem="kvr-be-fbh" secondAttribute="top" constant="70" id="ENJ-tA-Y3H"/> 154 <constraint firstItem="fz9-NP-VLV" firstAttribute="top" secondItem="kvr-be-fbh" secondAttribute="top" constant="70" id="ENJ-tA-Y3H"/>
158 <constraint firstAttribute="centerX" secondItem="fz9-NP-VLV" secondAttribute="centerX" id="X8u-75-ogj"/> 155 <constraint firstAttribute="centerX" secondItem="fz9-NP-VLV" secondAttribute="centerX" id="X8u-75-ogj"/>
159 - <constraint firstAttribute="bottom" secondItem="fz9-NP-VLV" secondAttribute="bottom" constant="70" id="qh2-6H-Nq5"/> 156 + <constraint firstAttribute="bottom" secondItem="fz9-NP-VLV" secondAttribute="bottom" constant="273" id="qh2-6H-Nq5"/>
160 </constraints> 157 </constraints>
161 <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/> 158 <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
162 <simulatedScreenMetrics key="simulatedDestinationMetrics"/> 159 <simulatedScreenMetrics key="simulatedDestinationMetrics"/>
DUREX Vendor Control/Base.lproj/DateRangePickerViewController_iPad.xib 0 → 100644
  View file @20a8711
  1 +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
  2 +<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="5056" systemVersion="12F45" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES">
  3 + <dependencies>
  4 + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
  5 + </dependencies>
  6 + <objects>
  7 + <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="DateRangePickerViewController">
  8 + <connections>
  9 + <outlet property="dateRangePickerView" destination="RS5-ft-hEF" id="zvw-DN-Tyw"/>
  10 + <outlet property="doneButton" destination="JjT-6I-8h2" id="RNp-OD-Bgm"/>
  11 + <outlet property="fromDate" destination="5jh-Em-ORd" id="T14-Qf-rI8"/>
  12 + <outlet property="fromToggler" destination="qf5-xv-6RK" id="CeF-fk-YPg"/>
  13 + <outlet property="scrollView" destination="RS5-ft-hEF" id="jPI-cM-UYW"/>
  14 + <outlet property="scrolledView" destination="E2t-iZ-4z0" id="GMP-o2-imY"/>
  15 + <outlet property="toDate" destination="yQT-o9-gle" id="AIs-JX-DVm"/>
  16 + <outlet property="toLabel" destination="dRe-Qx-Lml" id="0HW-Gi-GMm"/>
  17 + <outlet property="toToggler" destination="5bA-94-boo" id="P9O-EO-vVQ"/>
  18 + <outlet property="view" destination="Nic-Ro-Csh" id="Y1m-bk-Dyk"/>
  19 + </connections>
  20 + </placeholder>
  21 + <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
  22 + <view contentMode="scaleToFill" id="Nic-Ro-Csh">
  23 + <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
  24 + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
  25 + <subviews>
  26 + <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="RS5-ft-hEF">
  27 + <rect key="frame" x="134" y="109" width="500" height="140"/>
  28 + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
  29 + <subviews>
  30 + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="E2t-iZ-4z0">
  31 + <rect key="frame" x="0.0" y="0.0" width="500" height="626"/>
  32 + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
  33 + <subviews>
  34 + <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="qf5-xv-6RK">
  35 + <rect key="frame" x="73" y="20" width="51" height="31"/>
  36 + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  37 + <connections>
  38 + <action selector="toggleFromDate:" destination="-1" eventType="valueChanged" id="4HC-lG-Xm8"/>
  39 + </connections>
  40 + </switch>
  41 + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="From:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WiF-nR-ajG">
  42 + <rect key="frame" x="20" y="25" width="45" height="21"/>
  43 + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  44 + <fontDescription key="fontDescription" type="system" pointSize="17"/>
  45 + <nil key="highlightedColor"/>
  46 + </label>
  47 + <datePicker hidden="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="5jh-Em-ORd">
  48 + <rect key="frame" x="0.0" y="59" width="500" height="216"/>
  49 + <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
  50 + <date key="date" timeIntervalSinceReferenceDate="432831543.046426">
  51 + <!--2014-09-19 14:59:03 +0000-->
  52 + </date>
  53 + <timeZone key="timeZone" name="America/Los_Angeles">
  54 + <mutableData key="data">
  55 +VFppZgAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAAAAAC5AAAABAAAABCepkign7sVkKCGKqChmveQ
  56 +y4kaoNIj9HDSYSYQ1v50INiArZDa/tGg28CQENzes6DdqayQ3r6VoN+JjpDgnneg4WlwkOJ+WaDjSVKQ
  57 +5F47oOUpNJDmR1gg5xJREOgnOiDo8jMQ6gccIOrSFRDr5v4g7LH3EO3G4CDukdkQ76/8oPBxuxDxj96g
  58 +8n/BkPNvwKD0X6OQ9U+ioPY/hZD3L4Sg+CiiEPkPZqD6CIQQ+viDIPvoZhD82GUg/chIEP64RyD/qCoQ
  59 +AJgpIAGIDBACeAsgA3EokARhJ6AFUQqQBkEJoAcw7JAHjUOgCRDOkAmtvyAK8LCQC+CvoAzZzRANwJGg
  60 +DrmvEA+priAQmZEQEYmQIBJ5cxATaXIgFFlVEBVJVCAWOTcQFyk2IBgiU5AZCRggGgI1kBryNKAb4heQ
  61 +HNIWoB3B+ZAesfigH6HbkCB2KyAhgb2QIlYNICNq2hAkNe8gJUq8ECYV0SAnKp4QJ/7toCkKgBAp3s+g
  62 +KupiECu+saAs036QLZ6ToC6zYJAvfnWgMJNCkDFnkiAycySQM0d0IDRTBpA1J1YgNjLokDcHOCA4HAUQ
  63 +OOcaIDn75xA6xvwgO9vJEDywGKA9u6sQPo/6oD+bjRBAb9ygQYSpkEJPvqBDZIuQRC+goEVEbZBF89Mg
  64 +Ry2KEEfTtSBJDWwQSbOXIErtThBLnLOgTNZqkE18laBOtkyQT1x3oFCWLpBRPFmgUnYQkFMcO6BUVfKQ
  65 +VPwdoFY11JBW5TogWB7xEFjFHCBZ/tMQWqT+IFvetRBchOAgXb6XEF5kwiBfnnkQYE3eoGGHlZBiLcCg
  66 +Y2d3kGQNoqBlR1mQZe2EoGcnO5BnzWagaQcdkGmtSKBq5v+Qa5ZlIGzQHBBtdkcgbq/+EG9WKSBwj+AQ
  67 +cTYLIHJvwhBzFe0gdE+kEHT/CaB2OMCQdt7roHgYopB4vs2gefiEkHqer6B72GaQfH6RoH24SJB+XnOg
  68 +f5gqkAABAAECAwEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
  69 +AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
  70 +AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
  71 +AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
  72 +</mutableData>
  73 + </timeZone>
  74 + </datePicker>
  75 + <datePicker hidden="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="yQT-o9-gle">
  76 + <rect key="frame" x="0.0" y="92" width="500" height="216"/>
  77 + <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
  78 + <date key="date" timeIntervalSinceReferenceDate="432831563.55105501">
  79 + <!--2014-09-19 14:59:23 +0000-->
  80 + </date>
  81 + <timeZone key="timeZone" name="America/Los_Angeles">
  82 + <mutableData key="data">
  83 +VFppZgAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAAAAAC5AAAABAAAABCepkign7sVkKCGKqChmveQ
  84 +y4kaoNIj9HDSYSYQ1v50INiArZDa/tGg28CQENzes6DdqayQ3r6VoN+JjpDgnneg4WlwkOJ+WaDjSVKQ
  85 +5F47oOUpNJDmR1gg5xJREOgnOiDo8jMQ6gccIOrSFRDr5v4g7LH3EO3G4CDukdkQ76/8oPBxuxDxj96g
  86 +8n/BkPNvwKD0X6OQ9U+ioPY/hZD3L4Sg+CiiEPkPZqD6CIQQ+viDIPvoZhD82GUg/chIEP64RyD/qCoQ
  87 +AJgpIAGIDBACeAsgA3EokARhJ6AFUQqQBkEJoAcw7JAHjUOgCRDOkAmtvyAK8LCQC+CvoAzZzRANwJGg
  88 +DrmvEA+priAQmZEQEYmQIBJ5cxATaXIgFFlVEBVJVCAWOTcQFyk2IBgiU5AZCRggGgI1kBryNKAb4heQ
  89 +HNIWoB3B+ZAesfigH6HbkCB2KyAhgb2QIlYNICNq2hAkNe8gJUq8ECYV0SAnKp4QJ/7toCkKgBAp3s+g
  90 +KupiECu+saAs036QLZ6ToC6zYJAvfnWgMJNCkDFnkiAycySQM0d0IDRTBpA1J1YgNjLokDcHOCA4HAUQ
  91 +OOcaIDn75xA6xvwgO9vJEDywGKA9u6sQPo/6oD+bjRBAb9ygQYSpkEJPvqBDZIuQRC+goEVEbZBF89Mg
  92 +Ry2KEEfTtSBJDWwQSbOXIErtThBLnLOgTNZqkE18laBOtkyQT1x3oFCWLpBRPFmgUnYQkFMcO6BUVfKQ
  93 +VPwdoFY11JBW5TogWB7xEFjFHCBZ/tMQWqT+IFvetRBchOAgXb6XEF5kwiBfnnkQYE3eoGGHlZBiLcCg
  94 +Y2d3kGQNoqBlR1mQZe2EoGcnO5BnzWagaQcdkGmtSKBq5v+Qa5ZlIGzQHBBtdkcgbq/+EG9WKSBwj+AQ
  95 +cTYLIHJvwhBzFe0gdE+kEHT/CaB2OMCQdt7roHgYopB4vs2gefiEkHqer6B72GaQfH6RoH24SJB+XnOg
  96 +f5gqkAABAAECAwEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
  97 +AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
  98 +AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
  99 +AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
  100 +</mutableData>
  101 + </timeZone>
  102 + </datePicker>
  103 + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="To:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dRe-Qx-Lml">
  104 + <rect key="frame" x="20" y="64" width="23" height="21"/>
  105 + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  106 + <fontDescription key="fontDescription" type="system" pointSize="17"/>
  107 + <nil key="highlightedColor"/>
  108 + </label>
  109 + <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="5bA-94-boo">
  110 + <rect key="frame" x="51" y="59" width="51" height="31"/>
  111 + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  112 + <connections>
  113 + <action selector="toggleToDate:" destination="-1" eventType="valueChanged" id="JqI-PK-gCv"/>
  114 + </connections>
  115 + </switch>
  116 + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="JjT-6I-8h2">
  117 + <rect key="frame" x="232" y="97" width="37" height="30"/>
  118 + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  119 + <state key="normal" title="Done">
  120 + <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
  121 + </state>
  122 + <connections>
  123 + <action selector="closePopup:" destination="-1" eventType="touchUpInside" id="CuT-zY-343"/>
  124 + </connections>
  125 + </button>
  126 + </subviews>
  127 + <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
  128 + <constraints>
  129 + <constraint firstItem="qf5-xv-6RK" firstAttribute="top" secondItem="E2t-iZ-4z0" secondAttribute="top" constant="20" id="A7u-HO-4VL"/>
  130 + <constraint firstItem="dRe-Qx-Lml" firstAttribute="top" secondItem="WiF-nR-ajG" secondAttribute="bottom" constant="18" id="Deo-Pd-y7q"/>
  131 + <constraint firstItem="yQT-o9-gle" firstAttribute="top" secondItem="5bA-94-boo" secondAttribute="bottom" constant="2" id="H3F-eL-pvl"/>
  132 + <constraint firstItem="WiF-nR-ajG" firstAttribute="leading" secondItem="E2t-iZ-4z0" secondAttribute="leading" constant="20" id="N5v-Sy-RWV"/>
  133 + <constraint firstItem="5bA-94-boo" firstAttribute="top" secondItem="qf5-xv-6RK" secondAttribute="bottom" constant="8" id="PPB-jm-7y8"/>
  134 + <constraint firstItem="JjT-6I-8h2" firstAttribute="leading" secondItem="E2t-iZ-4z0" secondAttribute="leading" constant="232" id="Sjv-9Y-pUr"/>
  135 + <constraint firstItem="dRe-Qx-Lml" firstAttribute="leading" secondItem="E2t-iZ-4z0" secondAttribute="leading" constant="20" id="d01-Ej-wEd"/>
  136 + <constraint firstItem="5bA-94-boo" firstAttribute="leading" secondItem="dRe-Qx-Lml" secondAttribute="trailing" constant="8" id="eFD-VY-09E"/>
  137 + <constraint firstAttribute="centerX" secondItem="5jh-Em-ORd" secondAttribute="centerX" id="rxI-eD-QM0"/>
  138 + <constraint firstAttribute="centerX" secondItem="yQT-o9-gle" secondAttribute="centerX" id="t22-P0-QPH"/>
  139 + <constraint firstItem="JjT-6I-8h2" firstAttribute="top" secondItem="5bA-94-boo" secondAttribute="bottom" constant="7" id="tQp-z3-Xn1"/>
  140 + <constraint firstAttribute="height" constant="626" id="tS1-Rt-VK1"/>
  141 + <constraint firstAttribute="width" constant="500" id="wri-92-iq4"/>
  142 + <constraint firstItem="qf5-xv-6RK" firstAttribute="leading" secondItem="WiF-nR-ajG" secondAttribute="trailing" constant="8" id="ws8-Uc-fCh"/>
  143 + <constraint firstItem="WiF-nR-ajG" firstAttribute="top" secondItem="E2t-iZ-4z0" secondAttribute="top" constant="25" id="zdK-ew-c5q"/>
  144 + </constraints>
  145 + </view>
  146 + </subviews>
  147 + <constraints>
  148 + <constraint firstAttribute="width" constant="500" id="0oT-rZ-3HW"/>
  149 + <constraint firstItem="E2t-iZ-4z0" firstAttribute="leading" secondItem="RS5-ft-hEF" secondAttribute="leading" id="Qsk-ub-poF"/>
  150 + <constraint firstItem="E2t-iZ-4z0" firstAttribute="top" secondItem="RS5-ft-hEF" secondAttribute="top" id="tDW-CH-OK7"/>
  151 + <constraint firstAttribute="height" constant="140" id="xWs-ti-eD8"/>
  152 + <constraint firstAttribute="trailing" secondItem="E2t-iZ-4z0" secondAttribute="trailing" id="yyi-at-VbU"/>
  153 + </constraints>
  154 + </scrollView>
  155 + </subviews>
  156 + <color key="backgroundColor" red="0.023529414089999999" green="0.0039215688589999999" blue="0.0039215688589999999" alpha="0.5" colorSpace="deviceRGB"/>
  157 + <constraints>
  158 + <constraint firstItem="RS5-ft-hEF" firstAttribute="top" secondItem="Nic-Ro-Csh" secondAttribute="top" constant="109" id="DjU-fI-YK9"/>
  159 + <constraint firstAttribute="centerX" secondItem="RS5-ft-hEF" secondAttribute="centerX" id="Lz9-gg-71X"/>
  160 + </constraints>
  161 + <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
  162 + </view>
  163 + </objects>
  164 +</document>
DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj
  View file @20a8711
@@ -18,8 +18,8 @@ @@ -18,8 +18,8 @@
18 34AAB88D189805300019860D /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 34AAB88C189805300019860D /* Images.xcassets */; }; 18 34AAB88D189805300019860D /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 34AAB88C189805300019860D /* Images.xcassets */; };
19 F9015D9019B73052006C7882 /* DatePickerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9015D9219B73052006C7882 /* DatePickerViewController.xib */; }; 19 F9015D9019B73052006C7882 /* DatePickerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9015D9219B73052006C7882 /* DatePickerViewController.xib */; };
20 F9015D9719B7305E006C7882 /* DatePickerViewController_iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9015D9919B7305E006C7882 /* DatePickerViewController_iPad.xib */; }; 20 F9015D9719B7305E006C7882 /* DatePickerViewController_iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9015D9919B7305E006C7882 /* DatePickerViewController_iPad.xib */; };
  21 + F90416FC19CC776E00333AD8 /* DateRangePickerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F90416FE19CC776E00333AD8 /* DateRangePickerViewController.xib */; };
21 F915612919C3D16D00126FE2 /* DateRangePickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F915612719C3D16D00126FE2 /* DateRangePickerViewController.m */; }; 22 F915612919C3D16D00126FE2 /* DateRangePickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F915612719C3D16D00126FE2 /* DateRangePickerViewController.m */; };
22 - F915612A19C3D16D00126FE2 /* DateRangePickerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F915612819C3D16D00126FE2 /* DateRangePickerViewController.xib */; };  
23 F92F567919B75F5E00A1EACA /* PriceChangerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F92F567719B75F5E00A1EACA /* PriceChangerViewController.m */; }; 23 F92F567919B75F5E00A1EACA /* PriceChangerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F92F567719B75F5E00A1EACA /* PriceChangerViewController.m */; };
24 F92F567D19B7609C00A1EACA /* PriceChangerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F92F567F19B7609C00A1EACA /* PriceChangerViewController.xib */; }; 24 F92F567D19B7609C00A1EACA /* PriceChangerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F92F567F19B7609C00A1EACA /* PriceChangerViewController.xib */; };
25 F92F568419B760A800A1EACA /* PriceChangerViewController_iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = F92F568619B760A800A1EACA /* PriceChangerViewController_iPad.xib */; }; 25 F92F568419B760A800A1EACA /* PriceChangerViewController_iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = F92F568619B760A800A1EACA /* PriceChangerViewController_iPad.xib */; };
@@ -42,6 +42,7 @@ @@ -42,6 +42,7 @@
42 F989B5FC19BBC80300657DD9 /* carat.png in Resources */ = {isa = PBXBuildFile; fileRef = F989B5FA19BBC80300657DD9 /* carat.png */; }; 42 F989B5FC19BBC80300657DD9 /* carat.png in Resources */ = {isa = PBXBuildFile; fileRef = F989B5FA19BBC80300657DD9 /* carat.png */; };
43 F989B5FF19BCD7A100657DD9 /* Sale.m in Sources */ = {isa = PBXBuildFile; fileRef = F989B5FE19BCD7A100657DD9 /* Sale.m */; }; 43 F989B5FF19BCD7A100657DD9 /* Sale.m in Sources */ = {isa = PBXBuildFile; fileRef = F989B5FE19BCD7A100657DD9 /* Sale.m */; };
44 F989B60219BCE28C00657DD9 /* SalesLog.m in Sources */ = {isa = PBXBuildFile; fileRef = F989B60119BCE28C00657DD9 /* SalesLog.m */; }; 44 F989B60219BCE28C00657DD9 /* SalesLog.m in Sources */ = {isa = PBXBuildFile; fileRef = F989B60119BCE28C00657DD9 /* SalesLog.m */; };
  45 + F996591219CC7F3D00667BEC /* DateRangePickerViewController_iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = F996591419CC7F3D00667BEC /* DateRangePickerViewController_iPad.xib */; };
45 F9A8EF7C192FE201009E7532 /* Stack.m in Sources */ = {isa = PBXBuildFile; fileRef = F9A8EF7B192FE201009E7532 /* Stack.m */; }; 46 F9A8EF7C192FE201009E7532 /* Stack.m in Sources */ = {isa = PBXBuildFile; fileRef = F9A8EF7B192FE201009E7532 /* Stack.m */; };
46 F9C77F50192CDE30002DBE8A /* system.json in Resources */ = {isa = PBXBuildFile; fileRef = F9C77F4F192CDE30002DBE8A /* system.json */; }; 47 F9C77F50192CDE30002DBE8A /* system.json in Resources */ = {isa = PBXBuildFile; fileRef = F9C77F4F192CDE30002DBE8A /* system.json */; };
47 F9CED59A19BE086E008F3764 /* UIView+Toast.m in Sources */ = {isa = PBXBuildFile; fileRef = F9CED59919BE086E008F3764 /* UIView+Toast.m */; }; 48 F9CED59A19BE086E008F3764 /* UIView+Toast.m in Sources */ = {isa = PBXBuildFile; fileRef = F9CED59919BE086E008F3764 /* UIView+Toast.m */; };
@@ -84,9 +85,11 @@ @@ -84,9 +85,11 @@
84 F9015D9819B7305E006C7882 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DatePickerViewController_iPad.xib; sourceTree = "<group>"; }; 85 F9015D9819B7305E006C7882 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DatePickerViewController_iPad.xib; sourceTree = "<group>"; };
85 F9015D9B19B73062006C7882 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DatePickerViewController_iPad.strings; sourceTree = "<group>"; }; 86 F9015D9B19B73062006C7882 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DatePickerViewController_iPad.strings; sourceTree = "<group>"; };
86 F9015D9D19B73062006C7882 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/DatePickerViewController_iPad.strings; sourceTree = "<group>"; }; 87 F9015D9D19B73062006C7882 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/DatePickerViewController_iPad.strings; sourceTree = "<group>"; };
  88 + F90416FD19CC776E00333AD8 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DateRangePickerViewController.xib; sourceTree = "<group>"; };
  89 + F904170019CC777200333AD8 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DateRangePickerViewController.strings; sourceTree = "<group>"; };
  90 + F904170219CC777300333AD8 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/DateRangePickerViewController.strings; sourceTree = "<group>"; };
87 F915612619C3D16D00126FE2 /* DateRangePickerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateRangePickerViewController.h; sourceTree = SOURCE_ROOT; }; 91 F915612619C3D16D00126FE2 /* DateRangePickerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateRangePickerViewController.h; sourceTree = SOURCE_ROOT; };
88 F915612719C3D16D00126FE2 /* DateRangePickerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DateRangePickerViewController.m; sourceTree = SOURCE_ROOT; }; 92 F915612719C3D16D00126FE2 /* DateRangePickerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DateRangePickerViewController.m; sourceTree = SOURCE_ROOT; };
89 - F915612819C3D16D00126FE2 /* DateRangePickerViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DateRangePickerViewController.xib; sourceTree = SOURCE_ROOT; };  
90 F92F567619B75F5E00A1EACA /* PriceChangerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PriceChangerViewController.h; sourceTree = SOURCE_ROOT; }; 93 F92F567619B75F5E00A1EACA /* PriceChangerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PriceChangerViewController.h; sourceTree = SOURCE_ROOT; };
91 F92F567719B75F5E00A1EACA /* PriceChangerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PriceChangerViewController.m; sourceTree = SOURCE_ROOT; }; 94 F92F567719B75F5E00A1EACA /* PriceChangerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PriceChangerViewController.m; sourceTree = SOURCE_ROOT; };
92 F92F567E19B7609C00A1EACA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PriceChangerViewController.xib; sourceTree = "<group>"; }; 95 F92F567E19B7609C00A1EACA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PriceChangerViewController.xib; sourceTree = "<group>"; };
@@ -134,6 +137,9 @@ @@ -134,6 +137,9 @@
134 F989B5FE19BCD7A100657DD9 /* Sale.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Sale.m; sourceTree = SOURCE_ROOT; }; 137 F989B5FE19BCD7A100657DD9 /* Sale.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Sale.m; sourceTree = SOURCE_ROOT; };
135 F989B60019BCE28C00657DD9 /* SalesLog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SalesLog.h; sourceTree = SOURCE_ROOT; }; 138 F989B60019BCE28C00657DD9 /* SalesLog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SalesLog.h; sourceTree = SOURCE_ROOT; };
136 F989B60119BCE28C00657DD9 /* SalesLog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SalesLog.m; sourceTree = SOURCE_ROOT; }; 139 F989B60119BCE28C00657DD9 /* SalesLog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SalesLog.m; sourceTree = SOURCE_ROOT; };
  140 + F996591319CC7F3D00667BEC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DateRangePickerViewController_iPad.xib; sourceTree = "<group>"; };
  141 + F996591619CC7F4400667BEC /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DateRangePickerViewController_iPad.strings; sourceTree = "<group>"; };
  142 + F996591819CC7F4500667BEC /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/DateRangePickerViewController_iPad.strings; sourceTree = "<group>"; };
137 F9A8EF7A192FE201009E7532 /* Stack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Stack.h; sourceTree = SOURCE_ROOT; }; 143 F9A8EF7A192FE201009E7532 /* Stack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Stack.h; sourceTree = SOURCE_ROOT; };
138 F9A8EF7B192FE201009E7532 /* Stack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Stack.m; sourceTree = SOURCE_ROOT; }; 144 F9A8EF7B192FE201009E7532 /* Stack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Stack.m; sourceTree = SOURCE_ROOT; };
139 F9C77F4F192CDE30002DBE8A /* system.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = system.json; sourceTree = SOURCE_ROOT; }; 145 F9C77F4F192CDE30002DBE8A /* system.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = system.json; sourceTree = SOURCE_ROOT; };
@@ -297,10 +303,10 @@ @@ -297,10 +303,10 @@
297 F92F568619B760A800A1EACA /* PriceChangerViewController_iPad.xib */, 303 F92F568619B760A800A1EACA /* PriceChangerViewController_iPad.xib */,
298 F92F569419B7665F00A1EACA /* NameChangerViewController.xib */, 304 F92F569419B7665F00A1EACA /* NameChangerViewController.xib */,
299 F92F569D19B76A5D00A1EACA /* NameChangerViewController_iPad.xib */, 305 F92F569D19B76A5D00A1EACA /* NameChangerViewController_iPad.xib */,
300 - F915612819C3D16D00126FE2 /* DateRangePickerViewController.xib */, 306 + F90416FE19CC776E00333AD8 /* DateRangePickerViewController.xib */,
  307 + F996591419CC7F3D00667BEC /* DateRangePickerViewController_iPad.xib */,
301 ); 308 );
302 name = Views; 309 name = Views;
303 - path = ..;  
304 sourceTree = "<group>"; 310 sourceTree = "<group>";
305 }; 311 };
306 F9ED745519B89E7700C7298D /* Headers */ = { 312 F9ED745519B89E7700C7298D /* Headers */ = {
@@ -401,7 +407,8 @@ @@ -401,7 +407,8 @@
401 F92F569B19B76A5D00A1EACA /* NameChangerViewController_iPad.xib in Resources */, 407 F92F569B19B76A5D00A1EACA /* NameChangerViewController_iPad.xib in Resources */,
402 F92F567D19B7609C00A1EACA /* PriceChangerViewController.xib in Resources */, 408 F92F567D19B7609C00A1EACA /* PriceChangerViewController.xib in Resources */,
403 F92F569219B7665F00A1EACA /* NameChangerViewController.xib in Resources */, 409 F92F569219B7665F00A1EACA /* NameChangerViewController.xib in Resources */,
404 - F915612A19C3D16D00126FE2 /* DateRangePickerViewController.xib in Resources */, 410 + F90416FC19CC776E00333AD8 /* DateRangePickerViewController.xib in Resources */,
  411 + F996591219CC7F3D00667BEC /* DateRangePickerViewController_iPad.xib in Resources */,
405 F961D80C199A5F2D00E9282C /* back_arrow.png in Resources */, 412 F961D80C199A5F2D00E9282C /* back_arrow.png in Resources */,
406 F961D816199A5FA000E9282C /* Localizable.strings in Resources */, 413 F961D816199A5FA000E9282C /* Localizable.strings in Resources */,
407 F97B90CB19B859F500DDA9EF /* icon_checkmark.png in Resources */, 414 F97B90CB19B859F500DDA9EF /* icon_checkmark.png in Resources */,
@@ -460,6 +467,16 @@ @@ -460,6 +467,16 @@
460 name = DatePickerViewController_iPad.xib; 467 name = DatePickerViewController_iPad.xib;
461 sourceTree = SOURCE_ROOT; 468 sourceTree = SOURCE_ROOT;
462 }; 469 };
  470 + F90416FE19CC776E00333AD8 /* DateRangePickerViewController.xib */ = {
  471 + isa = PBXVariantGroup;
  472 + children = (
  473 + F90416FD19CC776E00333AD8 /* Base */,
  474 + F904170019CC777200333AD8 /* en */,
  475 + F904170219CC777300333AD8 /* es */,
  476 + );
  477 + name = DateRangePickerViewController.xib;
  478 + sourceTree = SOURCE_ROOT;
  479 + };
463 F92F567F19B7609C00A1EACA /* PriceChangerViewController.xib */ = { 480 F92F567F19B7609C00A1EACA /* PriceChangerViewController.xib */ = {
464 isa = PBXVariantGroup; 481 isa = PBXVariantGroup;
465 children = ( 482 children = (
@@ -542,6 +559,16 @@ @@ -542,6 +559,16 @@
542 path = FirstAppExample; 559 path = FirstAppExample;
543 sourceTree = SOURCE_ROOT; 560 sourceTree = SOURCE_ROOT;
544 }; 561 };
  562 + F996591419CC7F3D00667BEC /* DateRangePickerViewController_iPad.xib */ = {
  563 + isa = PBXVariantGroup;
  564 + children = (
  565 + F996591319CC7F3D00667BEC /* Base */,
  566 + F996591619CC7F4400667BEC /* en */,
  567 + F996591819CC7F4500667BEC /* es */,
  568 + );
  569 + name = DateRangePickerViewController_iPad.xib;
  570 + sourceTree = SOURCE_ROOT;
  571 + };
545 F9E4D8FF19B8FD32009A7359 /* EMConnectingView_iPad.xib */ = { 572 F9E4D8FF19B8FD32009A7359 /* EMConnectingView_iPad.xib */ = {
546 isa = PBXVariantGroup; 573 isa = PBXVariantGroup;
547 children = ( 574 children = (
DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate
View file @20a8711
No preview for this file type
DUREX Vendor Control/DUREX Vendor Control.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  View file @20a8711
@@ -515,5 +515,101 @@ @@ -515,5 +515,101 @@
515 landmarkType = "5"> 515 landmarkType = "5">
516 </BreakpointContent> 516 </BreakpointContent>
517 </BreakpointProxy> 517 </BreakpointProxy>
  518 + <BreakpointProxy
  519 + BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
  520 + <BreakpointContent
  521 + shouldBeEnabled = "No"
  522 + ignoreCount = "0"
  523 + continueAfterRunningActions = "No"
  524 + filePath = "DateRangePickerViewController.m"
  525 + timestampString = "432833512.682389"
  526 + startingColumnNumber = "9223372036854775807"
  527 + endingColumnNumber = "9223372036854775807"
  528 + startingLineNumber = "131"
  529 + endingLineNumber = "131"
  530 + landmarkName = "-toggleFromDate:"
  531 + landmarkType = "5">
  532 + </BreakpointContent>
  533 + </BreakpointProxy>
  534 + <BreakpointProxy
  535 + BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
  536 + <BreakpointContent
  537 + shouldBeEnabled = "No"
  538 + ignoreCount = "0"
  539 + continueAfterRunningActions = "No"
  540 + filePath = "DateRangePickerViewController.m"
  541 + timestampString = "432833512.682389"
  542 + startingColumnNumber = "9223372036854775807"
  543 + endingColumnNumber = "9223372036854775807"
  544 + startingLineNumber = "155"
  545 + endingLineNumber = "155"
  546 + landmarkName = "-toggleToDate:"
  547 + landmarkType = "5">
  548 + </BreakpointContent>
  549 + </BreakpointProxy>
  550 + <BreakpointProxy
  551 + BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
  552 + <BreakpointContent
  553 + shouldBeEnabled = "No"
  554 + ignoreCount = "0"
  555 + continueAfterRunningActions = "No"
  556 + filePath = "DateRangePickerViewController.m"
  557 + timestampString = "432833512.682389"
  558 + startingColumnNumber = "9223372036854775807"
  559 + endingColumnNumber = "9223372036854775807"
  560 + startingLineNumber = "154"
  561 + endingLineNumber = "154"
  562 + landmarkName = "-toggleToDate:"
  563 + landmarkType = "5">
  564 + </BreakpointContent>
  565 + </BreakpointProxy>
  566 + <BreakpointProxy
  567 + BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
  568 + <BreakpointContent
  569 + shouldBeEnabled = "No"
  570 + ignoreCount = "0"
  571 + continueAfterRunningActions = "No"
  572 + filePath = "MenuTableViewController.m"
  573 + timestampString = "432823134.280139"
  574 + startingColumnNumber = "9223372036854775807"
  575 + endingColumnNumber = "9223372036854775807"
  576 + startingLineNumber = "1176"
  577 + endingLineNumber = "1176"
  578 + landmarkName = "-passDateRangeViewController:didFinishEnteringItem::"
  579 + landmarkType = "5">
  580 + </BreakpointContent>
  581 + </BreakpointProxy>
  582 + <BreakpointProxy
  583 + BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
  584 + <BreakpointContent
  585 + shouldBeEnabled = "No"
  586 + ignoreCount = "0"
  587 + continueAfterRunningActions = "No"
  588 + filePath = "MenuTableViewController.m"
  589 + timestampString = "432823146.488089"
  590 + startingColumnNumber = "9223372036854775807"
  591 + endingColumnNumber = "9223372036854775807"
  592 + startingLineNumber = "1159"
  593 + endingLineNumber = "1159"
  594 + landmarkName = "-passDateRangeViewController:didFinishEnteringItem::"
  595 + landmarkType = "5">
  596 + </BreakpointContent>
  597 + </BreakpointProxy>
  598 + <BreakpointProxy
  599 + BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
  600 + <BreakpointContent
  601 + shouldBeEnabled = "No"
  602 + ignoreCount = "0"
  603 + continueAfterRunningActions = "No"
  604 + filePath = "DateRangePickerViewController.m"
  605 + timestampString = "432833363.738094"
  606 + startingColumnNumber = "9223372036854775807"
  607 + endingColumnNumber = "9223372036854775807"
  608 + startingLineNumber = "102"
  609 + endingLineNumber = "102"
  610 + landmarkName = "-resizeViewHeight::"
  611 + landmarkType = "5">
  612 + </BreakpointContent>
  613 + </BreakpointProxy>
518 </Breakpoints> 614 </Breakpoints>
519 </Bucket> 615 </Bucket>
DUREX Vendor Control/DateRangePickerViewController.h
  View file @20a8711
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 18
19 #import <UIKit/UIKit.h> 19 #import <UIKit/UIKit.h>
20 #import <QuartzCore/QuartzCore.h> 20 #import <QuartzCore/QuartzCore.h>
21 -#import "DUREXAppDelegate.h" 21 +#import "DUREXAppDelegate.h"
22 22
23 @protocol DateRangePickerViewControllerDelegate <NSObject> 23 @protocol DateRangePickerViewControllerDelegate <NSObject>
24 - (void)passDateRangeViewController:(DateRangePickerViewController*)controller didFinishEnteringItem:(NSDate*) from : (NSDate*) to; 24 - (void)passDateRangeViewController:(DateRangePickerViewController*)controller didFinishEnteringItem:(NSDate*) from : (NSDate*) to;
@@ -32,6 +32,10 @@ @@ -32,6 +32,10 @@
32 @property (strong, nonatomic) IBOutlet UIDatePicker *toDate; 32 @property (strong, nonatomic) IBOutlet UIDatePicker *toDate;
33 @property (strong, nonatomic) IBOutlet UISwitch *fromToggler; 33 @property (strong, nonatomic) IBOutlet UISwitch *fromToggler;
34 @property (strong, nonatomic) IBOutlet UISwitch *toToggler; 34 @property (strong, nonatomic) IBOutlet UISwitch *toToggler;
  35 +@property (strong, nonatomic) IBOutlet UIButton *doneButton;
  36 +@property (strong, nonatomic) IBOutlet UILabel *toLabel;
  37 +@property (strong, nonatomic) IBOutlet UIScrollView *scrollView;
  38 +@property (strong, nonatomic) IBOutlet UIView *scrolledView;
35 @property (nonatomic, strong) id <DateRangePickerViewControllerDelegate> delegate; 39 @property (nonatomic, strong) id <DateRangePickerViewControllerDelegate> delegate;
36 40
37 - (void)showInView:(UIView *)aView animated:(BOOL)animated; 41 - (void)showInView:(UIView *)aView animated:(BOOL)animated;
DUREX Vendor Control/DateRangePickerViewController.m
  View file @20a8711
@@ -10,6 +10,8 @@ @@ -10,6 +10,8 @@
10 10
11 @interface DateRangePickerViewController () 11 @interface DateRangePickerViewController ()
12 12
  13 +@property uint8_t isExtended;
  14 +
13 @end 15 @end
14 16
15 @implementation DateRangePickerViewController 17 @implementation DateRangePickerViewController
@@ -36,10 +38,17 @@ @@ -36,10 +38,17 @@
36 [self.toDate setDate:[NSDate dateWithTimeIntervalSince1970:NSTimeIntervalSince1970]]; 38 [self.toDate setDate:[NSDate dateWithTimeIntervalSince1970:NSTimeIntervalSince1970]];
37 [self.toDate setDate:[NSDate date]]; 39 [self.toDate setDate:[NSDate date]];
38 40
  41 + [self setIsExtended:0];
  42 +
39 [super viewDidLoad]; 43 [super viewDidLoad];
40 // Do any additional setup after loading the view from its nib. 44 // Do any additional setup after loading the view from its nib.
41 } 45 }
42 46
  47 +- (void) viewDidAppear:(BOOL)animated
  48 +{
  49 + [super viewDidAppear:animated];
  50 +}
  51 +
43 - (void)didReceiveMemoryWarning 52 - (void)didReceiveMemoryWarning
44 { 53 {
45 [super didReceiveMemoryWarning]; 54 [super didReceiveMemoryWarning];
@@ -68,30 +77,93 @@ @@ -68,30 +77,93 @@
68 }]; 77 }];
69 } 78 }
70 79
  80 +- (void) moveUp: (UIView*) view : (NSUInteger) height
  81 +{
  82 + CGPoint position = view.center;
  83 + position.y -= height;
  84 + [UIView beginAnimations:@"MoveUp" context:NULL];
  85 + [UIView setAnimationDuration:0.5];
  86 + view.center = position;
  87 + [UIView commitAnimations];
  88 +}
  89 +
  90 +- (void) moveDown: (UIView*) view : (NSUInteger) height
  91 +{
  92 + CGPoint position = view.center;
  93 + position.y += height;
  94 + [UIView beginAnimations:@"MoveDown" context:NULL];
  95 + [UIView setAnimationDuration:0.5];
  96 + view.center = position;
  97 + [UIView commitAnimations];
  98 +}
  99 +
  100 +- (void) resizeViewHeight : (UIView*) view : (NSInteger) height
  101 +{
  102 + CGRect screenRect = [[UIScreen mainScreen] bounds];
  103 + CGFloat screenHeight = screenRect.size.height;
  104 + if((view.frame.size.height + height > screenHeight) && (height > 0))
  105 + {
  106 + NSLog(@"[DateRangePickerViewController.m]: Screen height limit reached");
  107 + }
  108 + else if(((height < 0) && ([self isExtended] != 0)) || ((height > 0) && ([self isExtended] != 2)))
  109 + {
  110 + [UIView beginAnimations:nil context:NULL];
  111 + [UIView setAnimationDuration:0.5];
  112 + view.frame = CGRectMake(view.frame.origin.x, view.frame.origin.y, view.frame.size.width,view.frame.size.height + height);
  113 + [UIView commitAnimations];
  114 + }
  115 + if(height < 0)
  116 + {
  117 + [self setIsExtended: [self isExtended] - 1];
  118 + }
  119 + else
  120 + {
  121 + [self setIsExtended: [self isExtended] + 1];
  122 + }
  123 + [self.scrollView setContentSize:CGSizeMake([self scrolledView].frame.size.width,[self scrolledView].frame.size.height)];
  124 + NSLog(@"ScrollView height: %f",[self scrollView].frame.size.height);
  125 +}
  126 +
71 - (IBAction)toggleFromDate:(id)sender 127 - (IBAction)toggleFromDate:(id)sender
72 { 128 {
  129 + NSUInteger height = [self fromDate].frame.size.height;
73 if([[self fromToggler] isOn]) 130 if([[self fromToggler] isOn])
74 { 131 {
75 [[self fromDate] setEnabled:TRUE]; 132 [[self fromDate] setEnabled:TRUE];
76 [[self fromDate] setHidden:FALSE]; 133 [[self fromDate] setHidden:FALSE];
  134 + [self moveDown:[self toToggler] :height];
  135 + [self moveDown:[self toDate] :height];
  136 + [self moveDown:[self doneButton] :height];
  137 + [self moveDown:[self toLabel] :height];
  138 + [self resizeViewHeight : [self scrollView] : height + 20];
77 } 139 }
78 else 140 else
79 { 141 {
80 [[self fromDate] setEnabled:FALSE]; 142 [[self fromDate] setEnabled:FALSE];
81 [[self fromDate] setHidden:TRUE]; 143 [[self fromDate] setHidden:TRUE];
  144 + [self moveUp:[self toToggler] :height];
  145 + [self moveUp:[self toDate] :height];
  146 + [self moveUp:[self doneButton] :height];
  147 + [self moveUp:[self toLabel] :height];
  148 + [self resizeViewHeight : [self scrollView] : - height - 20];
82 } 149 }
83 } 150 }
84 - (IBAction)toggleToDate:(id)sender 151 - (IBAction)toggleToDate:(id)sender
85 { 152 {
  153 + NSUInteger height = [self toDate].frame.size.height;
86 if([[self toToggler] isOn]) 154 if([[self toToggler] isOn])
87 { 155 {
88 [[self toDate] setEnabled:TRUE]; 156 [[self toDate] setEnabled:TRUE];
89 [[self toDate] setHidden:FALSE]; 157 [[self toDate] setHidden:FALSE];
  158 + [self moveDown:[self doneButton] :height];
  159 + [self resizeViewHeight : [self scrollView] : height + 20];
90 } 160 }
91 else 161 else
92 { 162 {
93 [[self toDate] setEnabled:FALSE]; 163 [[self toDate] setEnabled:FALSE];
94 [[self toDate] setHidden:TRUE]; 164 [[self toDate] setHidden:TRUE];
  165 + [self moveUp:[self doneButton] :height];
  166 + [self resizeViewHeight : [self scrollView] : - height - 20];
95 } 167 }
96 } 168 }
97 169
@@ -114,7 +186,8 @@ @@ -114,7 +186,8 @@
114 - (void)showInView:(UIView *)aView animated:(BOOL)animated 186 - (void)showInView:(UIView *)aView animated:(BOOL)animated
115 { 187 {
116 [aView addSubview:self.view]; 188 [aView addSubview:self.view];
117 - if (animated) { 189 + if (animated)
  190 + {
118 [self showAnimate]; 191 [self showAnimate];
119 } 192 }
120 } 193 }
DUREX Vendor Control/MenuTableViewController.m
  View file @20a8711
@@ -1163,8 +1163,16 @@ @@ -1163,8 +1163,16 @@
1163 1163
1164 NSCalendar *calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar]; 1164 NSCalendar *calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
1165 NSCalendarUnit units = NSYearCalendarUnit | NSMonthCalendarUnit | NSDayCalendarUnit | NSHourCalendarUnit | NSMinuteCalendarUnit | NSSecondCalendarUnit; 1165 NSCalendarUnit units = NSYearCalendarUnit | NSMonthCalendarUnit | NSDayCalendarUnit | NSHourCalendarUnit | NSMinuteCalendarUnit | NSSecondCalendarUnit;
1166 - NSDateComponents *componentsFrom = [calendar components:units fromDate:from];  
1167 - NSDateComponents *componentsTo = [calendar components:units fromDate:to]; 1166 + NSDateComponents *componentsFrom = nil;
  1167 + NSDateComponents *componentsTo = nil;
  1168 + if(from != nil)
  1169 + {
  1170 + componentsFrom = [calendar components:units fromDate:from];
  1171 + }
  1172 + if(to != nil)
  1173 + {
  1174 + componentsTo = [calendar components:units fromDate:to];
  1175 + }
1168 NSString *salesData = [_protocol readSalesLog: componentsFrom : componentsTo]; 1176 NSString *salesData = [_protocol readSalesLog: componentsFrom : componentsTo];
1169 if(salesData == nil) 1177 if(salesData == nil)
1170 { 1178 {
DUREX Vendor Control/en.lproj/DateRangePickerViewController.strings 0 → 100644
  View file @20a8711
  1 +
  2 +/* Class = "IBUILabel"; text = "To:"; ObjectID = "J6Y-lM-Rjf"; */
  3 +"J6Y-lM-Rjf.text" = "To:";
  4 +
  5 +/* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "aYc-3W-Uqn"; */
  6 +"aYc-3W-Uqn.normalTitle" = "Done";
  7 +
  8 +/* Class = "IBUILabel"; text = "From:"; ObjectID = "xIo-vd-lE7"; */
  9 +"xIo-vd-lE7.text" = "From:";
DUREX Vendor Control/en.lproj/DateRangePickerViewController_iPad.strings 0 → 100644
  View file @20a8711
  1 +
  2 +/* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "JjT-6I-8h2"; */
  3 +"JjT-6I-8h2.normalTitle" = "Done";
  4 +
  5 +/* Class = "IBUILabel"; text = "From:"; ObjectID = "WiF-nR-ajG"; */
  6 +"WiF-nR-ajG.text" = "From:";
  7 +
  8 +/* Class = "IBUILabel"; text = "To:"; ObjectID = "dRe-Qx-Lml"; */
  9 +"dRe-Qx-Lml.text" = "To:";
DUREX Vendor Control/es.lproj/DateRangePickerViewController.strings 0 → 100644
  View file @20a8711
  1 +
  2 +/* Class = "IBUILabel"; text = "To:"; ObjectID = "J6Y-lM-Rjf"; */
  3 +"J6Y-lM-Rjf.text" = "Desde:";
  4 +
  5 +/* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "aYc-3W-Uqn"; */
  6 +"aYc-3W-Uqn.normalTitle" = "Aceptar";
  7 +
  8 +/* Class = "IBUILabel"; text = "From:"; ObjectID = "xIo-vd-lE7"; */
  9 +"xIo-vd-lE7.text" = "Hasta:";
DUREX Vendor Control/es.lproj/DateRangePickerViewController_iPad.strings 0 → 100644
  View file @20a8711
  1 +
  2 +/* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "JjT-6I-8h2"; */
  3 +"JjT-6I-8h2.normalTitle" = "Aceptar";
  4 +
  5 +/* Class = "IBUILabel"; text = "From:"; ObjectID = "WiF-nR-ajG"; */
  6 +"WiF-nR-ajG.text" = "Desde:";
  7 +
  8 +/* Class = "IBUILabel"; text = "To:"; ObjectID = "dRe-Qx-Lml"; */
  9 +"dRe-Qx-Lml.text" = "Hasta:";
@@ -4,7 +4,6 @@ BUGS: @@ -4,7 +4,6 @@ BUGS:
4 TODO: 4 TODO:
5 5
6 - Reimplement protocol with async pattern 6 - Reimplement protocol with async pattern
7 -(WIP) - Add date range on Log request  
8 - Handle disconnects properly 7 - Handle disconnects properly
9 - Incident class 8 - Incident class
10 - Incident parser 9 - Incident parser