| 
						
					 | 
					
						
						
							
						
						478d5a8ced
	
				 
					 | 
					
						
						
							
							This branch is obsolete
						
						
						
						
						
						
							
						
					 | 
					
						2023-11-27 10:13:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						00bf13af86
					 | 
					
						
						
							
							Set payment method to 4 (steps).
						
						
						
						
						
						
						
						Removed any special days.
Added tariff03.json for maybe zone_3 in Schoenau. 
						
						
							
						
					 | 
					
						2023-11-07 14:46:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						062d936042
					 | 
					
						
						
							
							Minor: Added OTHERFILES
						
						
						
						
						
						
							
						
					 | 
					
						2023-11-07 14:45:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						86c27986cc
					 | 
					
						
						
							
							Added sone test code for Schoenau, Koenigsee.
						
						
						
						
						
						
							
						
					 | 
					
						2023-11-07 14:44:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						10b018a338
					 | 
					
						
						
							
							Lower restrictions when parsing json-files (needed for Schoenau, as there are no special days.)
						
						
						
						
						
						
							
						
					 | 
					
						2023-11-07 14:43:26 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1c13a705c8
					 | 
					
						
						
							
							Implemented GetCostFromDuration() for tariffs with step-structure and no special days
						
						
						
						
						
						
							
						
					 | 
					
						2023-11-07 14:41:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fd5b41364a
					 | 
					
						
						
							
							Added GetCostFromDuration()-functions: to be used for tariffs with only
						
						
						
						
						
						
						
						steps and no special days. Example: Schoenu, Koenigsee. 
						
						
							
						
					 | 
					
						2023-11-07 14:39:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cb78e27d37
					 | 
					
						
						
							
							Re-Test.
						
						
						
						
						
						
							
						
					 | 
					
						2023-10-11 15:49:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ff1dc4a10c
					 | 
					
						
						
							
							Add header file for project-variables
						
						
						
						
						
						
							
						
					 | 
					
						2023-10-11 15:46:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9d9fbc91f9
					 | 
					
						
						
							
							Read Project, Version and Info fields from json-tariff-files
						
						
						
						
						
						
							
						
					 | 
					
						2023-10-11 15:45:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e0ccec1ff2
					 | 
					
						
						
							
							Add header file atb_project.h
						
						
						
						
						
						
							
						
					 | 
					
						2023-10-11 15:43:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2974734642
					 | 
					
						
						
							
							Add ATBProject to configuration
						
						
						
						
						
						
							
						
					 | 
					
						2023-10-11 15:42:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6ea2ea7df7
					 | 
					
						
						
							
							Use helper functions GetTimeStep() and GetPriceForTimeStep() inside of
						
						
						
						
						
						
						
						GetCostFromDuration(). 
						
						
							
						
					 | 
					
						2023-10-11 15:41:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7508cb6c45
					 | 
					
						
						
							
							Add helper functions GetTimeSteps() and GetPriceForTimeSteps().
						
						
						
						
						
						
							
						
					 | 
					
						2023-10-11 15:40:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4925870227
					 | 
					
						
						
							
							Add helper functions for Schoenau: GetTimeSteps(0 and
						
						
						
						
						
						
						
						GetPriceForTimeStep(). 
						
						
							
						
					 | 
					
						2023-10-11 15:38:35 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c310f7a06d
					 | 
					
						
						
							
							test cases for schoenau
						
						
						
						
						
						
							
						
					 | 
					
						2023-10-11 15:37:35 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e99612fed9
					 | 
					
						
						
							
							draft for tariff files of schoenau
						
						
						
						
						
						
							
						
					 | 
					
						2023-10-11 15:36:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8e1ef45b3f
					 | 
					
						
						
							
							remove obsolete files
						
						
						
						
						
						
							
						
					 | 
					
						2023-10-11 15:35:50 +02: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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |