Skip to content
Snippets Groups Projects
Commit 8e911a86 authored by dmz39's avatar dmz39
Browse files

Adding View Event Screen and delete functionality

parent fcc4809c
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 378 additions and 88 deletions
Project/MoreFreeTime/MoreFreeTime.xcodeproj/project.pbxproj
+ 4
− 2
View file @ 8e911a86
......@@ -11,11 +11,11 @@
4D2793FF21AC7126008917B9 /* EventsTable.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4D2793FE21AC7126008917B9 /* EventsTable.storyboard */; };
4D27940121AC7197008917B9 /* EventsTableTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D27940021AC7197008917B9 /* EventsTableTableViewController.swift */; };
4D27940321AC71DA008917B9 /* ListViewDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D27940221AC71DA008917B9 /* ListViewDataSource.swift */; };
4D27942521ACE6B5008917B9 /* SQLite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D27941721ACE690008917B9 /* SQLite.framework */; };
4D27942621ACE6C5008917B9 /* SQLite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D27941721ACE690008917B9 /* SQLite.framework */; };
4D27942721ACE6C5008917B9 /* SQLite.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4D27941721ACE690008917B9 /* SQLite.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
4D27942C21ACEFCD008917B9 /* SQLite_Example.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D27942B21ACEFCD008917B9 /* SQLite_Example.swift */; };
4D27942F21ADEC2E008917B9 /* EventSingleDayCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D27942E21ADEC2E008917B9 /* EventSingleDayCell.swift */; };
4D27B29321B7201C001BE911 /* ViewEventViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D27B29221B7201C001BE911 /* ViewEventViewController.swift */; };
4D618EBF21AB6E0F006814C0 /* ScheduleControllerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D618EBE21AB6E0F006814C0 /* ScheduleControllerViewController.swift */; };
4D618EC121AB7707006814C0 /* DatePopupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D618EC021AB7707006814C0 /* DatePopupViewController.swift */; };
4D618EC321AB77DE006814C0 /* AddEventViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D618EC221AB77DE006814C0 /* AddEventViewController.swift */; };
......@@ -110,6 +110,7 @@
4D27940521ACE68F008917B9 /* SQLite.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SQLite.xcodeproj; path = "../../../../../../Downloads/SQLite.swift-master/SQLite.xcodeproj"; sourceTree = "<group>"; };
4D27942B21ACEFCD008917B9 /* SQLite_Example.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SQLite_Example.swift; sourceTree = "<group>"; };
4D27942E21ADEC2E008917B9 /* EventSingleDayCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventSingleDayCell.swift; sourceTree = "<group>"; };
4D27B29221B7201C001BE911 /* ViewEventViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewEventViewController.swift; sourceTree = "<group>"; };
4D618EBE21AB6E0F006814C0 /* ScheduleControllerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScheduleControllerViewController.swift; sourceTree = "<group>"; };
4D618EC021AB7707006814C0 /* DatePopupViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DatePopupViewController.swift; sourceTree = "<group>"; };
4D618EC221AB77DE006814C0 /* AddEventViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddEventViewController.swift; sourceTree = "<group>"; };
......@@ -131,7 +132,6 @@
buildActionMask = 2147483647;
files = (
4D27942621ACE6C5008917B9 /* SQLite.framework in Frameworks */,
4D27942521ACE6B5008917B9 /* SQLite.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -190,6 +190,7 @@
4D618EC721AB828C006814C0 /* EventsController.storyboard */,
4D618EBE21AB6E0F006814C0 /* ScheduleControllerViewController.swift */,
4D618EC221AB77DE006814C0 /* AddEventViewController.swift */,
4D27B29221B7201C001BE911 /* ViewEventViewController.swift */,
4D27942E21ADEC2E008917B9 /* EventSingleDayCell.swift */,
4D618EC421AB820C006814C0 /* DatePopup.storyboard */,
4D618EC021AB7707006814C0 /* DatePopupViewController.swift */,
......@@ -340,6 +341,7 @@
4DECCE0F21A8C71B006CA671 /* ViewController.swift in Sources */,
4D618EC321AB77DE006814C0 /* AddEventViewController.swift in Sources */,
4DF5C27521ABA62D00DF3B9B /* NotificationNameExtention.swift in Sources */,
4D27B29321B7201C001BE911 /* ViewEventViewController.swift in Sources */,
4D27940321AC71DA008917B9 /* ListViewDataSource.swift in Sources */,
4D27940121AC7197008917B9 /* EventsTableTableViewController.swift in Sources */,
4D618EC121AB7707006814C0 /* DatePopupViewController.swift in Sources */,
......
......
Project/MoreFreeTime/MoreFreeTime.xcodeproj/xcuserdata/diesel.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+ 33
− 17
View file @ 8e911a86
......@@ -10,12 +10,12 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "MoreFreeTime/ScheduleControllerViewController.swift"
timestampString = "565209945.895978"
timestampString = "565652210.07946"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "170"
endingLineNumber = "170"
landmarkName = "insertEvent(e:)"
startingLineNumber = "173"
endingLineNumber = "173"
landmarkName = "deleteEvent()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
......@@ -26,13 +26,13 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "MoreFreeTime/ScheduleControllerViewController.swift"
timestampString = "565209945.896077"
timestampString = "565652210.079531"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "255"
endingLineNumber = "255"
landmarkName = "tableView(_:didSelectRowAt:)"
landmarkType = "7">
startingLineNumber = "261"
endingLineNumber = "261"
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
......@@ -42,12 +42,12 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "MoreFreeTime/ScheduleControllerViewController.swift"
timestampString = "565209945.896148"
timestampString = "565652210.079582"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "248"
endingLineNumber = "248"
landmarkName = "tableView(_:didSelectRowAt:)"
startingLineNumber = "254"
endingLineNumber = "254"
landmarkName = "longPress(_:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
......@@ -58,12 +58,28 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "MoreFreeTime/ScheduleControllerViewController.swift"
timestampString = "565209945.896217"
timestampString = "565652210.079627"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "262"
endingLineNumber = "262"
landmarkName = "ScheduleControllerViewController"
landmarkType = "21">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "MoreFreeTime/AddEventViewController.swift"
timestampString = "565482003.443835"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "256"
endingLineNumber = "256"
landmarkName = "tableView(_:didSelectRowAt:)"
startingLineNumber = "105"
endingLineNumber = "105"
landmarkName = "setEndTimes()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
......
......
Project/MoreFreeTime/MoreFreeTime/EventSingleDayCell.swift
+ 0
− 18
View file @ 8e911a86
......@@ -27,22 +27,4 @@ class EventSingleDayCell: UITableViewCell {
self.eventEndTime.text = event.endTime
}
override func awakeFromNib() {
super.awakeFromNib()
// Initialization code
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
// Configure the view for the selected state
}
}
Project/MoreFreeTime/MoreFreeTime/MoreFreeTime/Base.lproj/EventsController.storyboard
+ 260
− 22
View file @ 8e911a86
......@@ -225,7 +225,7 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="AOH-2q-Yt5" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1844" y="19.340329835082461"/>
<point key="canvasLocation" x="1801" y="20"/>
</scene>
<!--DatePopup-->
<scene sceneID="Rwh-EU-gFF">
......@@ -262,7 +262,7 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Event Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="j0e-cc-zTU">
<rect key="frame" x="100" y="3" width="275" height="22"/>
<rect key="frame" x="140" y="3" width="275" height="25"/>
<constraints>
<constraint firstAttribute="width" constant="275" id="bEf-Pa-WRr"/>
</constraints>
......@@ -271,43 +271,62 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Location" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pzx-Yn-hd1">
<rect key="frame" x="100" y="26" width="275" height="20.5"/>
<rect key="frame" x="140" y="29" width="52" height="15"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="StTime" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZdP-oK-c2W">
<rect key="frame" x="10" y="3" width="71" height="22"/>
<rect key="frame" x="50" y="3" width="82" height="22"/>
<constraints>
<constraint firstAttribute="height" constant="22" id="vgM-WG-nsL"/>
<constraint firstAttribute="height" constant="22" id="md6-Qh-Q9R"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="EnTime" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XJw-je-nl5">
<rect key="frame" x="10" y="26" width="71" height="20.5"/>
<rect key="frame" x="50" y="26" width="82" height="21"/>
<constraints>
<constraint firstAttribute="width" constant="82" id="LfW-4p-bka"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Start:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7t1-aM-dcx">
<rect key="frame" x="9" y="3" width="37" height="15"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="End:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FhU-mt-vc3">
<rect key="frame" x="9" y="26" width="26" height="15"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstItem="j0e-cc-zTU" firstAttribute="top" secondItem="xP6-Eg-qXR" secondAttribute="top" constant="3" id="610-4S-fP8"/>
<constraint firstItem="ZdP-oK-c2W" firstAttribute="leading" secondItem="xP6-Eg-qXR" secondAttribute="leading" constant="10" id="AaR-dL-jWF"/>
<constraint firstItem="pzx-Yn-hd1" firstAttribute="top" secondItem="XJw-je-nl5" secondAttribute="top" id="DUy-fv-fII"/>
<constraint firstItem="pzx-Yn-hd1" firstAttribute="leading" secondItem="XJw-je-nl5" secondAttribute="trailing" constant="19" id="J8Q-79-nUC"/>
<constraint firstItem="ZdP-oK-c2W" firstAttribute="top" secondItem="xP6-Eg-qXR" secondAttribute="top" constant="3" id="OL8-Vd-Xfo"/>
<constraint firstItem="pzx-Yn-hd1" firstAttribute="leading" secondItem="j0e-cc-zTU" secondAttribute="leading" id="R2T-AI-Zi9"/>
<constraint firstAttribute="trailing" secondItem="j0e-cc-zTU" secondAttribute="trailing" id="Skd-rm-Qt4"/>
<constraint firstAttribute="bottom" secondItem="XJw-je-nl5" secondAttribute="bottom" constant="3" id="UWK-BP-RFS"/>
<constraint firstItem="pzx-Yn-hd1" firstAttribute="top" secondItem="j0e-cc-zTU" secondAttribute="bottom" constant="1" id="UxI-aF-W2J"/>
<constraint firstItem="pzx-Yn-hd1" firstAttribute="trailing" secondItem="j0e-cc-zTU" secondAttribute="trailing" id="Vds-ku-EX9"/>
<constraint firstItem="j0e-cc-zTU" firstAttribute="centerY" secondItem="ZdP-oK-c2W" secondAttribute="centerY" id="W2D-kc-Hbc"/>
<constraint firstItem="j0e-cc-zTU" firstAttribute="leading" secondItem="ZdP-oK-c2W" secondAttribute="trailing" constant="19" id="dyc-zX-M9R"/>
<constraint firstItem="XJw-je-nl5" firstAttribute="leading" secondItem="xP6-Eg-qXR" secondAttribute="leading" constant="10" id="lTu-6F-y2O"/>
<constraint firstItem="j0e-cc-zTU" firstAttribute="leading" secondItem="ZdP-oK-c2W" secondAttribute="trailing" constant="19" id="maC-PD-oNr"/>
<constraint firstItem="pzx-Yn-hd1" firstAttribute="bottom" secondItem="XJw-je-nl5" secondAttribute="bottom" id="tsD-60-nXg"/>
<constraint firstItem="7t1-aM-dcx" firstAttribute="leading" secondItem="FhU-mt-vc3" secondAttribute="leading" id="0gw-KY-0b2"/>
<constraint firstItem="pzx-Yn-hd1" firstAttribute="top" secondItem="j0e-cc-zTU" secondAttribute="bottom" constant="1" id="0mo-Ij-Gfu"/>
<constraint firstItem="7t1-aM-dcx" firstAttribute="top" secondItem="ZdP-oK-c2W" secondAttribute="top" id="140-uR-CwU"/>
<constraint firstItem="j0e-cc-zTU" firstAttribute="top" secondItem="xP6-Eg-qXR" secondAttribute="top" constant="3" id="3RB-rc-0wW"/>
<constraint firstAttribute="trailing" secondItem="pzx-Yn-hd1" secondAttribute="trailing" constant="183" id="3tF-3i-FCY"/>
<constraint firstItem="FhU-mt-vc3" firstAttribute="leading" secondItem="xP6-Eg-qXR" secondAttribute="leadingMargin" constant="-6" id="4qv-iU-BI4"/>
<constraint firstAttribute="trailing" secondItem="j0e-cc-zTU" secondAttribute="trailing" constant="-40" id="GTw-h1-J6P"/>
<constraint firstAttribute="bottomMargin" secondItem="FhU-mt-vc3" secondAttribute="bottom" constant="-2" id="Mn2-rB-hLL"/>
<constraint firstItem="XJw-je-nl5" firstAttribute="centerY" secondItem="pzx-Yn-hd1" secondAttribute="centerY" id="OJl-gG-wCM"/>
<constraint firstItem="FhU-mt-vc3" firstAttribute="top" secondItem="XJw-je-nl5" secondAttribute="top" id="WES-NK-cnv"/>
<constraint firstAttribute="bottomMargin" secondItem="XJw-je-nl5" secondAttribute="bottom" constant="-8" id="c9I-mr-ghe"/>
<constraint firstItem="ZdP-oK-c2W" firstAttribute="leading" secondItem="7t1-aM-dcx" secondAttribute="trailing" constant="4" id="eXH-Su-YcL"/>
<constraint firstItem="ZdP-oK-c2W" firstAttribute="leading" secondItem="XJw-je-nl5" secondAttribute="leading" id="jtn-qL-BmN"/>
<constraint firstItem="j0e-cc-zTU" firstAttribute="leading" secondItem="ZdP-oK-c2W" secondAttribute="trailing" constant="8" symbolic="YES" id="mrG-yt-0S0"/>
<constraint firstItem="FhU-mt-vc3" firstAttribute="top" secondItem="7t1-aM-dcx" secondAttribute="bottom" constant="8" symbolic="YES" id="s6I-Bw-Lnp"/>
<constraint firstItem="ZdP-oK-c2W" firstAttribute="trailing" secondItem="XJw-je-nl5" secondAttribute="trailing" id="srl-wq-9hc"/>
<constraint firstAttribute="bottom" secondItem="pzx-Yn-hd1" secondAttribute="bottom" constant="5.5" id="uBk-zg-iTj"/>
<constraint firstItem="7t1-aM-dcx" firstAttribute="top" secondItem="j0e-cc-zTU" secondAttribute="top" id="wqT-Y4-Jxe"/>
<constraint firstItem="pzx-Yn-hd1" firstAttribute="top" secondItem="j0e-cc-zTU" secondAttribute="bottom" constant="1" id="xSH-VM-SQZ"/>
</constraints>
</tableViewCellContentView>
<connections>
......@@ -370,8 +389,227 @@
</objects>
<point key="canvasLocation" x="696.79999999999995" y="20.239880059970016"/>
</scene>
<!--View Event View Controller-->
<scene sceneID="OwS-rJ-XU6">
<objects>
<viewController storyboardIdentifier="ViewEventViewController" id="kEI-RL-QrE" customClass="ViewEventViewController" customModule="MoreFreeTime" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="SAE-AB-uYC">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ISe-K9-QGo">
<rect key="frame" x="0.0" y="20" width="375" height="647"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2mn-zP-uZ0">
<rect key="frame" x="14" y="162" width="347" height="83"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Pvj-jJ-taq" userLabel="endDate">
<rect key="frame" x="71" y="52" width="118" height="21"/>
<constraints>
<constraint firstAttribute="width" constant="118" id="96y-TQ-jZU"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ek1-LD-IHQ" userLabel="startTime">
<rect key="frame" x="210" y="10" width="110" height="22"/>
<constraints>
<constraint firstAttribute="width" constant="110" id="Fdm-7X-BFc"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="El9-Uy-4yE" userLabel="endTime">
<rect key="frame" x="210" y="49" width="110" height="24"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="End:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OzK-kZ-6Rz">
<rect key="frame" x="8" y="49" width="61" height="24"/>
<constraints>
<constraint firstAttribute="width" constant="61" id="gbG-Kh-4Ng"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="20"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fwG-ZT-jBw" userLabel="startDate">
<rect key="frame" x="71" y="9" width="131" height="22"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Start:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HnG-cw-ays">
<rect key="frame" x="8" y="9" width="56" height="24"/>
<fontDescription key="fontDescription" type="system" pointSize="20"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="HnG-cw-ays" firstAttribute="centerY" secondItem="ek1-LD-IHQ" secondAttribute="centerY" id="3cJ-LX-vHq"/>
<constraint firstItem="fwG-ZT-jBw" firstAttribute="top" secondItem="HnG-cw-ays" secondAttribute="top" id="3yq-mj-jjd"/>
<constraint firstItem="OzK-kZ-6Rz" firstAttribute="leading" secondItem="HnG-cw-ays" secondAttribute="leading" id="5wh-tj-EhF"/>
<constraint firstItem="HnG-cw-ays" firstAttribute="top" secondItem="2mn-zP-uZ0" secondAttribute="top" constant="9" id="E6z-6D-rrL"/>
<constraint firstItem="Pvj-jJ-taq" firstAttribute="firstBaseline" secondItem="OzK-kZ-6Rz" secondAttribute="baseline" id="I5g-XU-4nw"/>
<constraint firstItem="El9-Uy-4yE" firstAttribute="leading" secondItem="Pvj-jJ-taq" secondAttribute="trailing" constant="21" id="J2G-mu-5wH"/>
<constraint firstItem="fwG-ZT-jBw" firstAttribute="leading" secondItem="Pvj-jJ-taq" secondAttribute="leading" id="OWK-we-DAb"/>
<constraint firstItem="fwG-ZT-jBw" firstAttribute="leading" secondItem="HnG-cw-ays" secondAttribute="trailing" constant="7" id="U1j-9o-A3R"/>
<constraint firstItem="ek1-LD-IHQ" firstAttribute="centerX" secondItem="El9-Uy-4yE" secondAttribute="centerX" id="VD2-xF-55D"/>
<constraint firstItem="Pvj-jJ-taq" firstAttribute="top" secondItem="fwG-ZT-jBw" secondAttribute="bottom" constant="21" id="WYF-Hs-qA5"/>
<constraint firstItem="HnG-cw-ays" firstAttribute="leading" secondItem="2mn-zP-uZ0" secondAttribute="leadingMargin" id="XQg-yT-ukI"/>
<constraint firstItem="ek1-LD-IHQ" firstAttribute="trailing" secondItem="El9-Uy-4yE" secondAttribute="trailing" id="cGl-gr-qyq"/>
<constraint firstItem="Pvj-jJ-taq" firstAttribute="leading" secondItem="OzK-kZ-6Rz" secondAttribute="trailing" constant="2" id="fcb-ac-G4A"/>
<constraint firstItem="El9-Uy-4yE" firstAttribute="top" secondItem="ek1-LD-IHQ" secondAttribute="bottom" constant="17" id="ibT-j2-tft"/>
<constraint firstItem="OzK-kZ-6Rz" firstAttribute="top" secondItem="El9-Uy-4yE" secondAttribute="top" id="mKq-IW-RNm"/>
<constraint firstItem="Pvj-jJ-taq" firstAttribute="baseline" secondItem="El9-Uy-4yE" secondAttribute="baseline" id="mUh-4W-PSb"/>
<constraint firstItem="ek1-LD-IHQ" firstAttribute="leading" secondItem="fwG-ZT-jBw" secondAttribute="trailing" constant="8" symbolic="YES" id="tqE-uj-6go"/>
<constraint firstItem="OzK-kZ-6Rz" firstAttribute="top" secondItem="HnG-cw-ays" secondAttribute="bottom" constant="16" id="wKw-38-WPa"/>
<constraint firstAttribute="height" constant="83" id="yVJ-je-yqk"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="View Event" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LcO-Vn-P5N">
<rect key="frame" x="15" y="14" width="196" height="33"/>
<constraints>
<constraint firstAttribute="width" constant="196" id="fdX-qz-Hvf"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="24"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="TIY-y7-3dH">
<rect key="frame" x="204" y="15" width="73" height="31"/>
<constraints>
<constraint firstAttribute="height" constant="31" id="Ref-1h-PxJ"/>
<constraint firstAttribute="width" constant="73" id="aYc-U2-TCB"/>
</constraints>
<state key="normal" title="Return"/>
<connections>
<action selector="clickCancel:" destination="Xaa-n3-v23" eventType="touchUpInside" id="1iW-Z8-dX4"/>
<action selector="clickReturnButton:" destination="kEI-RL-QrE" eventType="touchUpInside" id="3jn-To-bCe"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="249" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PDc-Yn-Urt">
<rect key="frame" x="272" y="15" width="95" height="31"/>
<state key="normal" title="Delete">
<color key="titleColor" red="1" green="0.036688899539221942" blue="0.03725551131865279" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<connections>
<action selector="clickCancel:" destination="Xaa-n3-v23" eventType="touchUpInside" id="stZ-4V-R55"/>
<action selector="deleteEventButton_Clicked:" destination="kEI-RL-QrE" eventType="touchUpInside" id="cNt-Hy-eAy"/>
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="R51-KG-vFz">
<rect key="frame" x="14" y="60" width="347" height="77"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oPa-Gr-1bZ">
<rect key="frame" x="8" y="8" width="331" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="3GO-Yb-aDE"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="22"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Location" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qgc-Hb-rCP">
<rect key="frame" x="98" y="46" width="241" height="22"/>
<constraints>
<constraint firstAttribute="width" constant="241" id="4bO-9m-Lcq"/>
<constraint firstAttribute="height" constant="22" id="NTg-si-ear"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Location:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AwO-Ae-RAu">
<rect key="frame" x="8" y="46" width="82" height="22"/>
<constraints>
<constraint firstAttribute="width" constant="82" id="Q9M-4i-IWh"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="qgc-Hb-rCP" firstAttribute="baseline" secondItem="AwO-Ae-RAu" secondAttribute="baseline" id="0f6-Tr-hWD"/>
<constraint firstItem="qgc-Hb-rCP" firstAttribute="leading" secondItem="AwO-Ae-RAu" secondAttribute="trailing" constant="8" symbolic="YES" id="7Bv-Hn-cEc"/>
<constraint firstAttribute="height" constant="77" id="E36-OR-A1U"/>
<constraint firstItem="qgc-Hb-rCP" firstAttribute="top" secondItem="oPa-Gr-1bZ" secondAttribute="bottom" constant="8" symbolic="YES" id="Mot-DZ-y9K"/>
<constraint firstAttribute="bottom" secondItem="qgc-Hb-rCP" secondAttribute="bottom" constant="9" id="Sf5-2s-bbF"/>
<constraint firstItem="qgc-Hb-rCP" firstAttribute="firstBaseline" secondItem="AwO-Ae-RAu" secondAttribute="firstBaseline" id="Vyh-eZ-9nb"/>
<constraint firstItem="AwO-Ae-RAu" firstAttribute="leading" secondItem="oPa-Gr-1bZ" secondAttribute="leading" id="iMn-Nh-KQ7"/>
<constraint firstItem="qgc-Hb-rCP" firstAttribute="trailing" secondItem="R51-KG-vFz" secondAttribute="trailingMargin" id="tUv-Dd-DML"/>
<constraint firstItem="qgc-Hb-rCP" firstAttribute="trailing" secondItem="oPa-Gr-1bZ" secondAttribute="trailing" id="zmQ-2m-aJx"/>
</constraints>
</view>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" text="Description" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="LGJ-Oo-BNR">
<rect key="frame" x="48" y="273" width="279" height="100"/>
<color key="backgroundColor" red="0.67078205960000004" green="0.67078205960000004" blue="0.67078205960000004" alpha="0.1061564701" colorSpace="custom" customColorSpace="sRGB"/>
<color key="tintColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="100" id="DQb-d9-oX3"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
</textView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="2mn-zP-uZ0" firstAttribute="leading" secondItem="R51-KG-vFz" secondAttribute="leading" id="5mb-yL-bfc"/>
<constraint firstItem="R51-KG-vFz" firstAttribute="top" secondItem="LcO-Vn-P5N" secondAttribute="bottom" constant="13" id="IQ7-UD-jZN"/>
<constraint firstAttribute="bottom" secondItem="LGJ-Oo-BNR" secondAttribute="bottom" constant="274" id="Ild-IJ-a1A"/>
<constraint firstItem="PDc-Yn-Urt" firstAttribute="centerY" secondItem="LcO-Vn-P5N" secondAttribute="centerY" id="Kml-IW-ZBz"/>
<constraint firstItem="R51-KG-vFz" firstAttribute="top" secondItem="ISe-K9-QGo" secondAttribute="top" constant="60" id="Ncr-vy-wVv"/>
<constraint firstItem="PDc-Yn-Urt" firstAttribute="leading" secondItem="LcO-Vn-P5N" secondAttribute="trailing" constant="61" id="OXI-Oo-6ps"/>
<constraint firstItem="R51-KG-vFz" firstAttribute="leading" secondItem="ISe-K9-QGo" secondAttribute="leading" constant="14" id="PCz-N7-dK8"/>
<constraint firstItem="PDc-Yn-Urt" firstAttribute="baseline" secondItem="TIY-y7-3dH" secondAttribute="firstBaseline" id="TA0-jC-duT"/>
<constraint firstItem="LcO-Vn-P5N" firstAttribute="leading" secondItem="ISe-K9-QGo" secondAttribute="leading" constant="15" id="U6a-uC-4MD"/>
<constraint firstItem="LGJ-Oo-BNR" firstAttribute="top" secondItem="2mn-zP-uZ0" secondAttribute="bottom" constant="28" id="Ufd-rX-8dl"/>
<constraint firstItem="2mn-zP-uZ0" firstAttribute="trailing" secondItem="R51-KG-vFz" secondAttribute="trailing" id="UiO-mt-reZ"/>
<constraint firstItem="PDc-Yn-Urt" firstAttribute="top" secondItem="TIY-y7-3dH" secondAttribute="top" id="VFN-Xm-jo4"/>
<constraint firstItem="2mn-zP-uZ0" firstAttribute="centerX" secondItem="LGJ-Oo-BNR" secondAttribute="centerX" id="Ydk-Hb-LjV"/>
<constraint firstItem="R51-KG-vFz" firstAttribute="centerX" secondItem="ISe-K9-QGo" secondAttribute="centerX" id="ark-TG-CXV"/>
<constraint firstAttribute="trailing" secondItem="TIY-y7-3dH" secondAttribute="trailing" constant="98" id="foa-YM-miM"/>
<constraint firstItem="2mn-zP-uZ0" firstAttribute="top" secondItem="R51-KG-vFz" secondAttribute="bottom" constant="25" id="fty-Lx-dzy"/>
<constraint firstItem="PDc-Yn-Urt" firstAttribute="trailing" secondItem="ISe-K9-QGo" secondAttribute="trailingMargin" id="ozW-Fz-FqQ"/>
<constraint firstAttribute="trailing" secondItem="LcO-Vn-P5N" secondAttribute="trailing" constant="164" id="qq6-C2-oMR"/>
<constraint firstItem="LcO-Vn-P5N" firstAttribute="top" secondItem="ISe-K9-QGo" secondAttribute="top" constant="14" id="yPk-ec-Ujk"/>
<constraint firstItem="LGJ-Oo-BNR" firstAttribute="leading" secondItem="ISe-K9-QGo" secondAttribute="leading" constant="48" id="zbv-Od-ahu"/>
</constraints>
</scrollView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="ISe-K9-QGo" firstAttribute="leading" secondItem="SAE-AB-uYC" secondAttribute="leading" id="Da6-NV-mm7"/>
<constraint firstAttribute="trailing" secondItem="ISe-K9-QGo" secondAttribute="trailing" id="hYu-sQ-Tgs"/>
<constraint firstItem="ISe-K9-QGo" firstAttribute="bottom" secondItem="7H1-RH-XJy" secondAttribute="bottom" id="vzM-Bz-J1m"/>
<constraint firstItem="ISe-K9-QGo" firstAttribute="top" secondItem="7H1-RH-XJy" secondAttribute="top" id="xLm-ZK-Kpt"/>
</constraints>
<viewLayoutGuide key="safeArea" id="7H1-RH-XJy"/>
</view>
<connections>
<outlet property="deleteEventButton" destination="PDc-Yn-Urt" id="li2-zU-o6n"/>
<outlet property="eventDescription" destination="LGJ-Oo-BNR" id="X4Q-2K-Fmy"/>
<outlet property="eventEndDate" destination="Pvj-jJ-taq" id="9eb-Sn-Cvo"/>
<outlet property="eventEndTime" destination="El9-Uy-4yE" id="KbZ-E0-Xb2"/>
<outlet property="eventLocation" destination="qgc-Hb-rCP" id="ijD-jT-Q5V"/>
<outlet property="eventStartDate" destination="fwG-ZT-jBw" id="yg2-qt-PiC"/>
<outlet property="eventStartTime" destination="ek1-LD-IHQ" id="VeI-PN-kgI"/>
<outlet property="eventTitle" destination="oPa-Gr-1bZ" id="WyF-Kr-H4b"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="D99-cg-KNC" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1800.8" y="-695.80209895052474"/>
</scene>
</scenes>
<inferredMetricsTieBreakers>
<segue reference="yBZ-gP-Re8"/>
<segue reference="w6l-3I-WV6"/>
</inferredMetricsTieBreakers>
</document>
Project/MoreFreeTime/MoreFreeTime/NotificationNameExtention.swift
+ 1
− 0
View file @ 8e911a86
......@@ -13,4 +13,5 @@ extension Notification.Name {
static let saveEndDateTime = Notification.Name(rawValue: "saveEndDateTime")
static let saveNewEvent = Notification.Name(rawValue: "saveNewEvent")
static let saveEditedEvent = Notification.Name(rawValue: "saveEditedEvent")
static let deleteEvent = Notification.Name(rawValue: "deleteEvent")
}
Project/MoreFreeTime/MoreFreeTime/ScheduleControllerViewController.swift
+ 32
− 29
View file @ 8e911a86
......@@ -30,6 +30,7 @@ class ScheduleControllerViewController: UIViewController/*, UITableViewDelegate,
var dateObserver : NSObjectProtocol?
var newEventObserver : NSObjectProtocol?
var editedEventObserver : NSObjectProtocol?
var deleteEventObserver : NSObjectProtocol?
var currentDate : Date = Date()
var currentShortDate : String?
......@@ -69,10 +70,14 @@ class ScheduleControllerViewController: UIViewController/*, UITableViewDelegate,
currentShortDate = formattedShortDate
dateLabel.text = formattedDate
//Pull all events from Database that correspond to date
tableView.delegate = self
tableView.dataSource = self
getTodaysEvents()
let longPressGesture:UILongPressGestureRecognizer = UILongPressGestureRecognizer(target: self, action: #selector(ScheduleControllerViewController.longPress(_:)))
longPressGesture.minimumPressDuration = 1.0 // 1 second press
longPressGesture.delegate = self as? UIGestureRecognizerDelegate
self.tableView.addGestureRecognizer(longPressGesture)
}
func addObservers() {
......@@ -82,23 +87,20 @@ class ScheduleControllerViewController: UIViewController/*, UITableViewDelegate,
self.dateLabel.text = dateVc.formattedDateLong
self.currentShortDate = dateVc.formattedDate
self.getTodaysEvents()
//print(self.events)
//When the date changes, also clear the events and populate with the current dates events
}
newEventObserver = NotificationCenter.default.addObserver(forName: .saveNewEvent, object: nil, queue: OperationQueue.main) {
(notification) in let newEvent = notification.object as! Event
self.insertEvent(e: newEvent)
print("Events List:")
self.getTodaysEvents()
print("OBSERVER: event added")
//print(self.events)
}
editedEventObserver = NotificationCenter.default.addObserver(forName: .saveEditedEvent, object: nil, queue: OperationQueue.main) {
(notification) in let editedEvent = notification.object as! Event
self.updateEvent(e: editedEvent)
self.getTodaysEvents()
}
deleteEventObserver = NotificationCenter.default.addObserver(forName: .deleteEvent, object: nil, queue: OperationQueue.main) {
(notification) in let deleteEventId = notification.object as! Int
self.deleteEvent(id : deleteEventId)
}
print("added observer")
}
......@@ -154,8 +156,8 @@ class ScheduleControllerViewController: UIViewController/*, UITableViewDelegate,
}
}
func deleteEvent() {
let event = self.eventsTable.filter(self.id == 1)
func deleteEvent(id : Int) {
let event = self.eventsTable.filter(self.id == id)
let deleteEvent = event.delete()
do {
try self.database.run(deleteEvent)
......@@ -174,17 +176,6 @@ class ScheduleControllerViewController: UIViewController/*, UITableViewDelegate,
}
}
func insertGenericEvent() {
let insertEvent = self.eventsTable.insert(self.eventTitle <- "Name", self.eventStartDate <- "EventStartDate", self.eventStartTime <- "EventStartTime",self.eventEndDate <- "EventEndDate", self.eventEndTime <- "EventEndTime", self.eventLocation <- "EventLocation", self.eventDescription <- "EventDescription")
do {
try self.database.run(insertEvent)
print("Inserted Event")
} catch {
print("Error")
}
}
func updateEvent(e : Event) {
let event = self.eventsTable.filter(self.id == e.id)
let updateEvent = event.update(self.eventTitle <- e.title, self.eventStartDate <- e.startDate, self.eventStartTime <- e.startTime, self.eventEndDate <- e.endDate, self.eventEndTime <- e.endTime, self.eventLocation <- e.location, self.eventDescription <- e.description)
......@@ -206,10 +197,6 @@ class ScheduleControllerViewController: UIViewController/*, UITableViewDelegate,
}
}
func populateEvents() {
//This is where the events in the page will be populated from
}
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
if segue.identifier == "toCurrentDatePopupView" {
let popup = segue.destination as! DatePopupViewController
......@@ -229,6 +216,23 @@ class ScheduleControllerViewController: UIViewController/*, UITableViewDelegate,
print("Event Observer Deallocated")
}
}
@objc func longPress(_ longPressGestureRecognizer: UILongPressGestureRecognizer) {
if longPressGestureRecognizer.state == UIGestureRecognizer.State.began {
let touchPoint = longPressGestureRecognizer.location(in: self.tableView)
if let indexPath = tableView.indexPathForRow(at: touchPoint) {
let vc = UIStoryboard(name: "EventsController", bundle: nil).instantiateViewController(withIdentifier: "AddEventViewController") as! AddEventViewController
vc.edit = true
vc.eventForEdit = events[indexPath.row]
let navigationController = UINavigationController(rootViewController: vc)
self.modalPresentationStyle = UIModalPresentationStyle.overCurrentContext
navigationController.modalPresentationStyle = UIModalPresentationStyle.overCurrentContext
self.present(navigationController, animated: true, completion: nil)
}
}
}
}
extension ScheduleControllerViewController : UITableViewDataSource, UITableViewDelegate {
......@@ -245,14 +249,13 @@ extension ScheduleControllerViewController : UITableViewDataSource, UITableViewD
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
print("Clicked Cell")
let vc = UIStoryboard(name: "EventsController", bundle: nil).instantiateViewController(withIdentifier: "AddEventViewController") as! AddEventViewController
vc.edit = true
vc.eventForEdit = events[indexPath.row]
let vc = UIStoryboard(name: "EventsController", bundle: nil).instantiateViewController(withIdentifier: "ViewEventViewController") as! ViewEventViewController
vc.viewEvent = events[indexPath.row]
let navigationController = UINavigationController(rootViewController: vc)
self.modalPresentationStyle = UIModalPresentationStyle.overCurrentContext
navigationController.modalPresentationStyle = UIModalPresentationStyle.overCurrentContext
self.present(navigationController, animated: true, completion: nil)
}
}
Project/MoreFreeTime/MoreFreeTime/ViewEventViewController.swift 0 → 100644
+ 48
− 0
View file @ 8e911a86
//
// ViewEventViewController.swift
// MoreFreeTime
//
// Created by Dylan Zeller on 12/4/18.
// Copyright © 2018 Dylan Zeller. All rights reserved.
//
import UIKit
class ViewEventViewController: UIViewController {
@IBOutlet weak var eventTitle: UILabel!
@IBOutlet weak var eventLocation: UILabel!
@IBOutlet weak var eventStartDate: UILabel!
@IBOutlet weak var eventStartTime: UILabel!
@IBOutlet weak var eventEndDate: UILabel!
@IBOutlet weak var eventEndTime: UILabel!
@IBOutlet weak var eventDescription: UITextView!
@IBOutlet weak var deleteEventButton: UIButton!
var viewEvent : Event!
override func viewDidLoad() {
super.viewDidLoad()
setLabels()
}
func setLabels() {
eventTitle.text = viewEvent.title
eventLocation.text = viewEvent.location
eventStartDate.text = viewEvent.startDate
eventStartTime.text = viewEvent.startTime
eventEndDate.text = viewEvent.endDate
eventEndTime.text = viewEvent.endTime
eventDescription.text = viewEvent.description
}
@IBAction func deleteEventButton_Clicked(_ sender: Any) {
NotificationCenter.default.post(name: .deleteEvent, object: self.viewEvent.id)
dismiss(animated: true)
}
@IBAction func clickReturnButton(_ sender: Any) {
dismiss(animated: true)
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment