diff --git a/MavLift/src/main/scala/bootstrap/liftweb/Boot.scala b/MavLift/src/main/scala/bootstrap/liftweb/Boot.scala index 0e6b16195..908048082 100755 --- a/MavLift/src/main/scala/bootstrap/liftweb/Boot.scala +++ b/MavLift/src/main/scala/bootstrap/liftweb/Boot.scala @@ -76,9 +76,9 @@ class Boot { Menu.i("TESOBE") / "accounts" / "tesobe" submenus( Menu.i("Anonymous") / "accounts" / "tesobe" / "anonymous", Menu.i("Our Network") / "accounts" / "tesobe" / "our-network", - Menu.i("Authorities") / "accounts" / "tesobe" / "authorities", Menu.i("Team") / "accounts" / "tesobe" / "team", - Menu.i("Board") / "accounts" / "tesobe" / "board" + Menu.i("Board") / "accounts" / "tesobe" / "board", + Menu.i("Authorities") / "accounts" / "tesobe" / "authorities" ) ) ) diff --git a/MavLift/src/main/scala/code/snippet/OBPTransactionSnippet.scala b/MavLift/src/main/scala/code/snippet/OBPTransactionSnippet.scala index 682339b55..d385e95dd 100644 --- a/MavLift/src/main/scala/code/snippet/OBPTransactionSnippet.scala +++ b/MavLift/src/main/scala/code/snippet/OBPTransactionSnippet.scala @@ -46,7 +46,24 @@ class OBPTransactionSnippet extends StatefulSnippet with PaginatorSnippet[OBPTra value.toString else if(consumer == "board") value.toString - else if(consumer == "tax_office") + else if(consumer == "authorities") + value.toString + else if(consumer == "anonymous") + (if (value < 0) "-" else "+") + else + "---" + show + } + + def present_obp_transaction_amount(value: Double, consumer: String): String = { + // How the other account is presented to others + // Use an alias if shy wins + val show: String = + if(consumer == "team") + value.toString + else if(consumer == "board") + value.toString + else if(consumer == "authorities") value.toString else if(consumer == "anonymous") (if (value < 0) "-" else "+") @@ -58,10 +75,15 @@ class OBPTransactionSnippet extends StatefulSnippet with PaginatorSnippet[OBPTra def present_obp_transaction_other_account(value: String, consumer: String): String = { // How the other account is presented to others // Use an alias if shy wins + + val outsiders: List[String] = List("anonymous") + + if (other_account_is_shy(value, consumer)) other_account_alias(value) else value } + def other_account_is_a_client(value: String): Boolean = { // A list of clients val clients: List[String] = List("TXTR GMBH") @@ -84,7 +106,7 @@ class OBPTransactionSnippet extends StatefulSnippet with PaginatorSnippet[OBPTra // A list of the financially shy (or just plain private) val the_shy: List[String] = List("Tim Kleinschmidt", "Jan Slabiak") // A list of those that can look anyway - val the_gods: List[String] = List("team", "board", "tax_office") + val the_gods: List[String] = List("team", "board", "authorities") // No one can be shy in front of the gods (the_shy.contains(value) && !(the_gods.contains(value))) } @@ -128,7 +150,7 @@ class OBPTransactionSnippet extends StatefulSnippet with PaginatorSnippet[OBPTra ".obp_transaction_type_de *" #> obp_transaction.obp_transaction_type_de & ".obp_transaction_data_blob *" #> present_obp_transaction_other_account(obp_transaction.obp_transaction_data_blob.value, consumer) & ".obp_transaction_new_balance *" #> present_obp_transaction_new_balance(obp_transaction.obp_transaction_new_balance.value, consumer) & - ".obp_transaction_amount *" #> obp_transaction.obp_transaction_amount & + ".obp_transaction_amount *" #> present_obp_transaction_amount(obp_transaction.obp_transaction_amount.value, consumer) & ".obp_transaction_currency *" #> obp_transaction.obp_transaction_currency & ".obp_transaction_date_start *" #> (formatter format obp_transaction.obp_transaction_date_start.is.getTime()) & ".obp_transaction_date_complete *" #> (formatter format obp_transaction.obp_transaction_date_complete.is.getTime()) & diff --git a/MavLift/src/main/webapp/accounts/tesobe/authorities.html b/MavLift/src/main/webapp/accounts/tesobe/authorities.html new file mode 100644 index 000000000..c22d1f7b3 --- /dev/null +++ b/MavLift/src/main/webapp/accounts/tesobe/authorities.html @@ -0,0 +1,52 @@ + + + + + For the tax Authorities + + +
+

For the tax Authorities

+

+ + Welcome. The time is Time goes here + +

+
+

Transactions

+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
AccountPostedClearedAmountCurrencyInfoBalance
start datecompleted dateobp_transaction_amountobp_transaction_currencyobp_transaction_data_blobobp_transaction_new_balance
+
+ + \ No newline at end of file diff --git a/MavLift/src/main/webapp/accounts/tesobe/board.html b/MavLift/src/main/webapp/accounts/tesobe/board.html index c31d44c18..9fe3424ac 100644 --- a/MavLift/src/main/webapp/accounts/tesobe/board.html +++ b/MavLift/src/main/webapp/accounts/tesobe/board.html @@ -12,6 +12,41 @@ Welcome. The time is Time goes here

+
+

Transactions

+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
AccountPostedClearedAmountCurrencyInfoBalance
start datecompleted dateobp_transaction_amountobp_transaction_currencyobp_transaction_data_blobobp_transaction_new_balance
\ No newline at end of file diff --git a/MavLift/src/main/webapp/accounts/tesobe/our-network.html b/MavLift/src/main/webapp/accounts/tesobe/our-network.html index 7006aa9da..74b88050e 100644 --- a/MavLift/src/main/webapp/accounts/tesobe/our-network.html +++ b/MavLift/src/main/webapp/accounts/tesobe/our-network.html @@ -12,6 +12,41 @@ Welcome. The time is Time goes here

+
+

Transactions

+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
AccountPostedClearedAmountCurrencyInfoBalance
start datecompleted dateobp_transaction_amountobp_transaction_currencyobp_transaction_data_blobobp_transaction_new_balance
\ No newline at end of file diff --git a/MavLift/src/main/webapp/accounts/tesobe/tax_office.html b/MavLift/src/main/webapp/accounts/tesobe/tax_office.html deleted file mode 100644 index 8723a22d6..000000000 --- a/MavLift/src/main/webapp/accounts/tesobe/tax_office.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - - For the tax Authorities - - -
-

For the tax Authorities

-

- - Welcome. The time is Time goes here - -

-
- - \ No newline at end of file diff --git a/MavLift/src/main/webapp/accounts/tesobe/team.html b/MavLift/src/main/webapp/accounts/tesobe/team.html index 9eee95af0..8b49da866 100644 --- a/MavLift/src/main/webapp/accounts/tesobe/team.html +++ b/MavLift/src/main/webapp/accounts/tesobe/team.html @@ -12,6 +12,41 @@ Welcome. The time is Time goes here

+
+

Transactions

+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
AccountPostedClearedAmountCurrencyInfoBalance
start datecompleted dateobp_transaction_amountobp_transaction_currencyobp_transaction_data_blobobp_transaction_new_balance
\ No newline at end of file diff --git a/MavLift/src/main/webapp/images/OBP_logo_simple.png b/MavLift/src/main/webapp/images/OBP_logo_simple.png new file mode 100644 index 000000000..e0aed9f0d Binary files /dev/null and b/MavLift/src/main/webapp/images/OBP_logo_simple.png differ