| 
						
					 | 
					
						
						
							
						
						80e228b498
					 | 
					
						
						
							
							GetCostFromDuration(): don't use condiftion PaymentMethod::Steps,
						
						
						
						
						
						
						
						but the multimap YearPeriod, which must be empty. 
						
						
							
						
					 | 
					
						2023-11-23 09:39:26 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						574161ff76
					 | 
					
						
						
							
							Call getDurationForPrice() in GetDurationForCost().
						
						
						
						
						
						
							
						
					 | 
					
						2023-11-23 09:38:34 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b80cd5e6ef
					 | 
					
						
						
							
							Remove parameter paymentMethod.
						
						
						
						
						
						
						
						Add GetDurationForPrice(). 
						
						
							
						
					 | 
					
						2023-11-23 09:36:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ccbf07a654
	
				 
					 | 
					
						
						
							
							Use new getPaymentOptions interface
						
						
						
						
						
						
							
						
					 | 
					
						2023-11-23 08:42:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3a2e521345
	
				 
					 | 
					
						
						
							
							Add interface to access 'PaymentOptions'
						
						
						
						
						
						
							
						
					 | 
					
						2023-11-22 16:27:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cd77e380ef
	
				 
					 | 
					
						
						
							
							Read project/version-info from tariff-config ...
						
						
						
						
						
						
						
						... if available 
						
						
							
						
					 | 
					
						2023-11-22 11:27:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						aaa4348a9a
	
				 
					 | 
					
						
						
							
							Add ATBProject to configuration
						
						
						
						
						
						
							
						
					 | 
					
						2023-11-22 11:14:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						17c4aac452
	
				 
					 | 
					
						
						
							
							Add header file atb_project.h
						
						
						
						
						
						
							
						
					 | 
					
						2023-11-22 11:14:38 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						68c438bfe0
	
				 
					 | 
					
						
						
							
							Add header file for project-variables
						
						
						
						
						
						
							
						
					 | 
					
						2023-11-22 11:13:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						509bc29d7e
	
				 
					 | 
					
						
						
							
							Fix: read tariff configuration file
						
						
						
						
						
						
							
						
					 | 
					
						2023-11-22 10:17:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f7e462188f
	
				 
					 | 
					
						
						
							
							Add methods for PaymentMethod::Steps
						
						
						
						
						
						
							
						
					 | 
					
						2023-11-22 09:53:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d15c9dad29
	
				 
					 | 
					
						
						
							
							Update tariff04 (virtual dayticket)
						
						
						
						
						
						
							
 1.0.0
						
					 | 
					
						2023-06-27 17:43:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cb8cd5dead
	
				 
					 | 
					
						
						
							
							Merge branch 'moransBranch'
						
						
						
						
						
						
							
						
					 | 
					
						2023-06-14 11:28:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9d64350e4f
	
				 
					 | 
					
						
						
							
							Merge branch 'moransBranch' of git.mimbach49.de:GerhardHoffmann/MOBILISIS-Calculator into moransBranch
						
						
						
						
						
						
							
						
					 | 
					
						2023-06-14 11:27:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1a71edc274
					 | 
					
						
						
							
							max_time=300, unit_id=1
						
						
						
						
						
						
							
						
					 | 
					
						2023-06-13 13:32:16 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						51d8beda2a
					 | 
					
						
						
							
							max_time=300, unit_id=1
						
						
						
						
						
						
							
						
					 | 
					
						2023-06-13 13:32:12 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7bab9d6ba2
					 | 
					
						
						
							
							max_time=300, unit_id=1
						
						
						
						
						
						
							
						
					 | 
					
						2023-06-13 13:32:08 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8b4d64bd0c
					 | 
					
						
						
							
							max_time=300, unit_id=1
						
						
						
						
						
						
							
						
					 | 
					
						2023-06-13 13:31:42 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						eefdde4693
					 | 
					
						
						
							
							Removed section whith superfluous 'price_per_unit < 0' check.
						
						
						
						
						
						
						
						Removed calc_price-caculation followed by shift of inputDate. 
						
						
							
						
					 | 
					
						2023-06-13 12:12:23 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6157861d62
					 | 
					
						
						
							
							Monday starts with 1
						
						
						
						
						
						
							
						
					 | 
					
						2023-06-13 12:11:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						23748966de
	
				 
					 | 
					
						
						
							
							Merge branch 'moransBranch' of git.mimbach49.de:GerhardHoffmann/MOBILISIS-Calculator into moransBranch
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-19 15:49:38 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7bd7f66666
					 | 
					
						
						
							
							Fixed pra_payment_unit_id
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-17 10:08:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						268d43cdea
	
				 
					 | 
					
						
						
							
							GetDailyTicketDuration: use QDateTime for timestamps
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-16 16:43:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a453886f0a
	
				 
					 | 
					
						
						
							
							Merge branch 'master' into moransBranch
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-16 15:35:47 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						eef94a3fb3
	
				 
					 | 
					
						
						
							
							Change interface: use QDateTime
						
						
						
						
						
						
						
						- use QDateTime instead of char*-string
 - GetCostFromDuration: add end_datetime as a return value 
						
						
							
						
					 | 
					
						2023-05-16 15:31:53 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						88a0b6ebe2
	
				 
					 | 
					
						
						
							
							Make main.c compile again
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-16 11:10:49 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3097819c01
	
				 
					 | 
					
						
						
							
							Update interface for 'compute_duration_for_daily_ticket()
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-16 11:07:21 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						acf799da7e
	
				 
					 | 
					
						
						
							
							Add explaining comments
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-15 17:37:51 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3bf71f84d5
	
				 
					 | 
					
						
						
							
							Merge branch 'moransBranch'
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-15 17:33:51 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						73f5eca656
	
				 
					 | 
					
						
						
							
							Tariff config: add day ticket
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-15 17:23:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b8753cc2ed
	
				 
					 | 
					
						
						
							
							Update tariff config for test
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-15 17:06:57 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						29986e0451
	
				 
					 | 
					
						
						
							
							Merge branch 'moransBranch' of git.mimbach49.de:GerhardHoffmann/MOBILISIS-Calculator into moransBranch
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-15 16:58:48 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1146db743c
	
				 
					 | 
					
						
						
							
							Add explaining comments
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-15 16:58:28 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c6302edec5
	
				 
					 | 
					
						
						
							
							Format all json files
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-15 16:57:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						617eee39ed
					 | 
					
						
						
							
							Daily ticket
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-15 14:05:55 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6b3c1cbf0c
					 | 
					
						
						
							
							Fix with min time in GetDurationFromCost
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-14 17:19:24 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1142efaec2
					 | 
					
						
						
							
							Rounding minutes seems to be fixed ...
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-14 16:15:37 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						90eae152bf
	
				 
					 | 
					
						
						
							
							Merge branch 'moransBranch'
						
						
						
						
						
						
							
 0.0.2
						
					 | 
					
						2023-05-12 14:48:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6d001f1501
	
				 
					 | 
					
						
						
							
							Fix: QDateTime.addSecs() creates a new object
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-12 14:28:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						de32022b89
	
				 
					 | 
					
						
						
							
							Merge branch 'moransBranch' of git.mimbach49.de:GerhardHoffmann/MOBILISIS-Calculator into moransBranch
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-12 14:10:57 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1e2f1589ac
	
				 
					 | 
					
						
						
							
							Fix: QDateTime::fromString()
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-12 14:10:16 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2f8c8cab4c
					 | 
					
						
						
							
							Another small fix on GetDurationFromCost()
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-12 13:02:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ee1f7eca44
	
				 
					 | 
					
						
						
							
							Merge branch 'master' of git.mimbach49.de:GerhardHoffmann/MOBILISIS-Calculator
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-12 12:43:49 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1069c5ad90
	
				 
					 | 
					
						
						
							
							main: add test for GetDurationFromCost
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-12 12:43:07 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						46bffc250d
	
				 
					 | 
					
						
						
							
							Fix: includepath for main
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-12 12:41:37 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2599513ef9
					 | 
					
						
						
							
							Minor fixes with +/- 1 minute offset.
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-12 12:40:25 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ef66c1f0c0
					 | 
					
						
						
							
							Fixed GetDurationFromCost()
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-12 11:55:35 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						219d820104
					 | 
					
						
						
							
							GetCostFromDuration fixed
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-12 09:20:46 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ed9166c226
					 | 
					
						
						
							
							Windows: set timezone as -3600.
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-11 13:58:33 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						818c67ad63
					 | 
					
						
						
							
							Windows debug: for init-Tariff, do not read zone_ne, but use the path given directly.
						
						
						
						
						
						
							
						
					 | 
					
						2023-05-11 13:57:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |