Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Eviction tool proof of concept #51

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Eviction tool proof of concept #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd817bc
Port evictions code from pos-guide demo
okdistribute Jun 13, 2024
1603f63
Combine
okdistribute Jun 13, 2024
4676769
Cleanup & get working
okdistribute Jun 13, 2024
b7501ab
Move force eviction up a level
okdistribute Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions electron-react-ts
Open in desktop
Submodule electron-react-ts added at d808d5
76 changes: 76 additions & 0 deletions iOS/DittoPOS.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,21 @@
objects = {

/* Begin PBXBuildFile section */
0123D1972C1B73FE00F73F62 /* AppConfigView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0123D1882C1B73FE00F73F62 /* AppConfigView.swift */; };
0123D1982C1B73FE00F73F62 /* DaysHoursMinutesPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0123D1892C1B73FE00F73F62 /* DaysHoursMinutesPickerView.swift */; };
0123D1992C1B73FE00F73F62 /* EvictionIntervalPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0123D18A2C1B73FE00F73F62 /* EvictionIntervalPickerView.swift */; };
0123D19A2C1B73FE00F73F62 /* FloatPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0123D18B2C1B73FE00F73F62 /* FloatPickerView.swift */; };
0123D19B2C1B73FE00F73F62 /* TTLPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0123D18C2C1B73FE00F73F62 /* TTLPickerView.swift */; };
0123D19C2C1B73FE00F73F62 /* VersionPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0123D18D2C1B73FE00F73F62 /* VersionPickerView.swift */; };
0123D19D2C1B73FE00F73F62 /* AppConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0123D18F2C1B73FE00F73F62 /* AppConfig.swift */; };
0123D19E2C1B73FE00F73F62 /* EvictionLogDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0123D1902C1B73FE00F73F62 /* EvictionLogDetailView.swift */; };
0123D19F2C1B73FE00F73F62 /* EvictionLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0123D1912C1B73FE00F73F62 /* EvictionLogger.swift */; };
0123D1A02C1B73FE00F73F62 /* EvictionLogsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0123D1922C1B73FE00F73F62 /* EvictionLogsView.swift */; };
0123D1A22C1B73FE00F73F62 /* EvictionService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0123D1942C1B73FE00F73F62 /* EvictionService.swift */; };
0123D1A32C1B73FE00F73F62 /* EvictionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0123D1952C1B73FE00F73F62 /* EvictionView.swift */; };
0123D1B82C1B745900F73F62 /* SyncService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0123D1B72C1B745900F73F62 /* SyncService.swift */; };
0123D1BB2C1B752600F73F62 /* DateUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0123D1B92C1B752600F73F62 /* DateUtils.swift */; };
0123D1BC2C1B752600F73F62 /* LoggingUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0123D1BA2C1B752600F73F62 /* LoggingUtils.swift */; };
0E1E919B2BA0E40800046BC0 /* DittoDataBrowser in Frameworks */ = {isa = PBXBuildFile; productRef = 0E1E919A2BA0E40800046BC0 /* DittoDataBrowser */; };
0E1E919D2BA0E40800046BC0 /* DittoDiskUsage in Frameworks */ = {isa = PBXBuildFile; productRef = 0E1E919C2BA0E40800046BC0 /* DittoDiskUsage */; };
0E1E919F2BA0E40800046BC0 /* DittoExportData in Frameworks */ = {isa = PBXBuildFile; productRef = 0E1E919E2BA0E40800046BC0 /* DittoExportData */; };
Expand Down Expand Up @@ -56,6 +71,21 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
0123D1882C1B73FE00F73F62 /* AppConfigView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppConfigView.swift; sourceTree = "<group>"; };
0123D1892C1B73FE00F73F62 /* DaysHoursMinutesPickerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DaysHoursMinutesPickerView.swift; sourceTree = "<group>"; };
0123D18A2C1B73FE00F73F62 /* EvictionIntervalPickerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EvictionIntervalPickerView.swift; sourceTree = "<group>"; };
0123D18B2C1B73FE00F73F62 /* FloatPickerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FloatPickerView.swift; sourceTree = "<group>"; };
0123D18C2C1B73FE00F73F62 /* TTLPickerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TTLPickerView.swift; sourceTree = "<group>"; };
0123D18D2C1B73FE00F73F62 /* VersionPickerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VersionPickerView.swift; sourceTree = "<group>"; };
0123D18F2C1B73FE00F73F62 /* AppConfig.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppConfig.swift; sourceTree = "<group>"; };
0123D1902C1B73FE00F73F62 /* EvictionLogDetailView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EvictionLogDetailView.swift; sourceTree = "<group>"; };
0123D1912C1B73FE00F73F62 /* EvictionLogger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EvictionLogger.swift; sourceTree = "<group>"; };
0123D1922C1B73FE00F73F62 /* EvictionLogsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EvictionLogsView.swift; sourceTree = "<group>"; };
0123D1942C1B73FE00F73F62 /* EvictionService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EvictionService.swift; sourceTree = "<group>"; };
0123D1952C1B73FE00F73F62 /* EvictionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EvictionView.swift; sourceTree = "<group>"; };
0123D1B72C1B745900F73F62 /* SyncService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SyncService.swift; sourceTree = "<group>"; };
0123D1B92C1B752600F73F62 /* DateUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DateUtils.swift; sourceTree = "<group>"; };
0123D1BA2C1B752600F73F62 /* LoggingUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoggingUtils.swift; sourceTree = "<group>"; };
0E1E91AC2BA0FC9300046BC0 /* LogFileConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogFileConfig.swift; sourceTree = "<group>"; };
0E3768B72BAE2FD3009A7053 /* HeartbeatConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeartbeatConfig.swift; sourceTree = "<group>"; };
112311FE2B3DBA0100A04E44 /* DittoExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DittoExtensions.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -117,6 +147,33 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
0123D18E2C1B73FE00F73F62 /* AppConfigView */ = {
isa = PBXGroup;
children = (
0123D1882C1B73FE00F73F62 /* AppConfigView.swift */,
0123D1892C1B73FE00F73F62 /* DaysHoursMinutesPickerView.swift */,
0123D18A2C1B73FE00F73F62 /* EvictionIntervalPickerView.swift */,
0123D18B2C1B73FE00F73F62 /* FloatPickerView.swift */,
0123D18C2C1B73FE00F73F62 /* TTLPickerView.swift */,
0123D18D2C1B73FE00F73F62 /* VersionPickerView.swift */,
);
path = AppConfigView;
sourceTree = "<group>";
};
0123D1962C1B73FE00F73F62 /* Eviction */ = {
isa = PBXGroup;
children = (
0123D18E2C1B73FE00F73F62 /* AppConfigView */,
0123D18F2C1B73FE00F73F62 /* AppConfig.swift */,
0123D1902C1B73FE00F73F62 /* EvictionLogDetailView.swift */,
0123D1912C1B73FE00F73F62 /* EvictionLogger.swift */,
0123D1922C1B73FE00F73F62 /* EvictionLogsView.swift */,
0123D1942C1B73FE00F73F62 /* EvictionService.swift */,
0123D1952C1B73FE00F73F62 /* EvictionView.swift */,
);
path = Eviction;
sourceTree = "<group>";
};
14039BEC2A465ECC001903ED /* POS */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -187,6 +244,7 @@
14CD51AF2A2FE2D50018DE87 /* DittoPOS */ = {
isa = PBXGroup;
children = (
0123D1962C1B73FE00F73F62 /* Eviction */,
14CD51B02A2FE2D50018DE87 /* DittoPOS.swift */,
14CD51B22A2FE2D50018DE87 /* MainView.swift */,
14DECF042A3A6868005BC2AE /* Data */,
Expand Down Expand Up @@ -215,6 +273,8 @@
14DECF032A3A6859005BC2AE /* Utilities */ = {
isa = PBXGroup;
children = (
0123D1B92C1B752600F73F62 /* DateUtils.swift */,
0123D1BA2C1B752600F73F62 /* LoggingUtils.swift */,
14039BEF2A4789AE001903ED /* CurrencyUtils.swift */,
14DECF1E2A3D13F0005BC2AE /* Utils.swift */,
);
Expand All @@ -224,6 +284,7 @@
14DECF042A3A6868005BC2AE /* Data */ = {
isa = PBXGroup;
children = (
0123D1B72C1B745900F73F62 /* SyncService.swift */,
14CD51BE2A2FE3EE0018DE87 /* DittoService.swift */,
112311FE2B3DBA0100A04E44 /* DittoExtensions.swift */,
14DECF052A3A68B0005BC2AE /* Location.swift */,
Expand Down Expand Up @@ -362,9 +423,12 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
0123D1A02C1B73FE00F73F62 /* EvictionLogsView.swift in Sources */,
0123D19F2C1B73FE00F73F62 /* EvictionLogger.swift in Sources */,
14CD51B32A2FE2D50018DE87 /* MainView.swift in Sources */,
1460E33D2A93DCC8007A2A6D /* KDS_VM.swift in Sources */,
14DECF1D2A3D13D9005BC2AE /* POSOrderView.swift in Sources */,
0123D1BC2C1B752600F73F62 /* LoggingUtils.swift in Sources */,
14CD51BF2A2FE3EE0018DE87 /* DittoService.swift in Sources */,
14DECF0A2A3B92D5005BC2AE /* Transaction.swift in Sources */,
149CABC62A32C43700729331 /* Env.swift in Sources */,
Expand All @@ -375,25 +439,37 @@
14DECF062A3A68B0005BC2AE /* Location.swift in Sources */,
14AB43882AD71FE900E58566 /* CustomLocation.swift in Sources */,
1414DEC22AA0F8D600D9CE87 /* KDSOrderItemView.swift in Sources */,
0123D1BB2C1B752600F73F62 /* DateUtils.swift in Sources */,
14DECF172A3CFF7D005BC2AE /* SaleItem.swift in Sources */,
14CD51B12A2FE2D50018DE87 /* DittoPOS.swift in Sources */,
14039BF02A4789AE001903ED /* CurrencyUtils.swift in Sources */,
1460E33B2A93DA5D007A2A6D /* KDSOrderView.swift in Sources */,
14DECF1F2A3D13F0005BC2AE /* Utils.swift in Sources */,
14DECF212A3D16DF005BC2AE /* KDSOrdersGridView.swift in Sources */,
14DECF112A3BDC3A005BC2AE /* LocationsView.swift in Sources */,
0123D1A32C1B73FE00F73F62 /* EvictionView.swift in Sources */,
148071162A8C2E930091EC03 /* SettingsView.swift in Sources */,
148071182A8C2E9E0091EC03 /* DittoToolsListItem.swift in Sources */,
0E3768B82BAE2FD3009A7053 /* HeartbeatConfig.swift in Sources */,
0123D19E2C1B73FE00F73F62 /* EvictionLogDetailView.swift in Sources */,
0123D1A22C1B73FE00F73F62 /* EvictionService.swift in Sources */,
14DECF1B2A3D13CF005BC2AE /* POSGridView.swift in Sources */,
14DECF152A3CCAB6005BC2AE /* POS_VM.swift in Sources */,
0123D1992C1B73FE00F73F62 /* EvictionIntervalPickerView.swift in Sources */,
14FFFEEF2A43639A00DD6806 /* POSOrderItemView.swift in Sources */,
0123D19A2C1B73FE00F73F62 /* FloatPickerView.swift in Sources */,
14DECF082A3A7F76005BC2AE /* Order.swift in Sources */,
0123D1972C1B73FE00F73F62 /* AppConfigView.swift in Sources */,
14AB43852AD713EF00E58566 /* CustomLocationScreen.swift in Sources */,
14DECF0D2A3BDC27005BC2AE /* POSView.swift in Sources */,
14FFFEF12A43732400DD6806 /* SettingsModel.swift in Sources */,
0123D19B2C1B73FE00F73F62 /* TTLPickerView.swift in Sources */,
14039BEE2A465F37001903ED /* POSOrderTotalView.swift in Sources */,
0123D1982C1B73FE00F73F62 /* DaysHoursMinutesPickerView.swift in Sources */,
0123D19D2C1B73FE00F73F62 /* AppConfig.swift in Sources */,
14DECF0F2A3BDC31005BC2AE /* KDSView.swift in Sources */,
0123D1B82C1B745900F73F62 /* SyncService.swift in Sources */,
0123D19C2C1B73FE00F73F62 /* VersionPickerView.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
4 changes: 2 additions & 2 deletions iOS/DittoPOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/getditto/DittoSwiftPackage",
"state" : {
"revision" : "e9ac25ae9d38d215cc5958c995450dbc9b9dbea7",
"version" : "4.7.1"
"revision" : "8f32d91b4a8d903e2e1da9abdae9f685c152f65d",
"version" : "4.7.2"
}
},
{
Expand Down
Loading