diff --git a/Northwind.axp b/Northwind.axp index a6a097e..322bdf5 100644 --- a/Northwind.axp +++ b/Northwind.axp @@ -1,4 +1,4 @@ -NorthwindrootlocalhostUTF-8TrueFalse12FalseAmerica/New_YorkFalseFalseTrueTruebootstrap.cssFalseTrue03424.112024-03-24 15:31:30C:\Users\micro\vm-shared\appgini-open-source-apps\northwind-demo\app0classicTrue1004FalseTrueFalseFalse +NorthwindrootlocalhostUTF-8TrueFalse12FalseAmerica/New_YorkFalseFalseTrueTruebootstrap.cssFalseTrue03424.132024-05-22 13:25:12C:\Users\micro\vm-shared\appgini-open-source-apps\northwind-demo\app0classicTrue1004FalseTrueFalseFalse {"events":{"shipped-order":{"type":"shipped-order","color":"success","table":"orders","customWhere":"","title":"{1} - {2}","allDay":"1","startDateField":"OrderDate","startTimeField":"","endDateField":"","endTimeField":""},"hiring":{"type":"hiring","color":"primary","table":"employees","customWhere":"","title":"{4}, {5}","allDay":"1","startDateField":"HireDate","startTimeField":"","endDateField":"","endTimeField":""}},"calendars":{"shipping-schedule":{"id":"shipping-schedule","title":"Shipping schedule","initial-view":"dayGridMonth","initial-date":"[last-year]","events":["shipped-order","hiring"],"locale":"","groups":["Sales","Admins"],"links-home":"1","links-navmenu":"2"}}} @@ -10,14 +10,14 @@ 0:8:9001:[{"report_hash":"rkeb4b1ypr50izb1qn5f","title":"Customers by country","table":"customers","table_index":0,"label":"Country","caption1":"Country","caption2":"Count of Customers","group_function":"count","group_function_field":null,"group_array":[],"look_up_table":"","look_up_value":"","label_field_index":"9","report_header_url":"","report_footer_url":"","data_table_section":1,"barchart_section":1,"piechart_section":0,"join_statment":"","date_separator":"\/"}] customersTrueTrueFalseTrueFalseTrueFalseTrueFalseTrueTrueTrueTrueTrueTrueFalse11010ordersTrueFalseFalse1ascaccount_balances.png0False0FalsehorizontalFalseFalse25%-1CompanyName15400FalseFalseTrueFalseFalseFalseFalseFalse250False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse1False00FalseFalseleft0000FalseCustomerID1550FalseFalseFalseTrueFalseFalseFalseFalse90False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse0False00FalseFalseleft0000FalseContactName15300FalseFalseFalseFalseFalseFalseFalseFalse200False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse2False00FalseFalseleft0000FalseContactTitle15300FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse3False00FalseFalseleft0000FalseAddress1800FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse4False00FalseFalseleft0000FalseCity15150FalseFalseFalseFalseFalseFalseFalseFalse100False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse5False00FalseFalseleft0000FalseRegion15150FalseFalseFalseFalseFalseFalseFalseFalse50False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse6False00FalseFalseleft0000FalsePostalCode15100FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse7False00FalseFalseleft0000FalseCountry15150FalseFalseFalseFalseFalseFalseFalseFalse120False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse8False00FalseFalseleft0000FalsePhone15240FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse9False00FalseFalseleft0000FalseFax15240FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse10False00FalseFalseleft0000FalseTotalSales8102FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseTrue11False00FalseFalseright0000TrueFalse11010ordersTrueFalseFalse1ascaccount_balances.png0False0FalsehorizontalFalseFalse25%-1CompanyName15400FalseFalseTrueFalseFalseFalseFalseFalse250False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse0False00FalseFalseleft0000FalseCustomerID1550FalseFalseFalseTrueFalseFalseFalseFalse90False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse1False00FalseFalseleft0000FalseContactName15300FalseFalseFalseFalseFalseFalseFalseFalse200False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse2False00FalseFalseleft0000FalseContactTitle15300FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse3False00FalseFalseleft0000FalseAddress1800FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse4False00FalseFalseleft0000FalseCity15150FalseFalseFalseFalseFalseFalseFalseFalse100False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse5False00FalseFalseleft0000FalseRegion15150FalseFalseFalseFalseFalseFalseFalseFalse50False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse6False00FalseFalseleft0000FalsePostalCode15100FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse7False00FalseFalseleft0000FalseCountry15150FalseFalseFalseFalseFalseFalseFalseFalse120False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse8False00FalseFalseleft0000FalsePhone15240FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse9False00FalseFalseleft0000FalseFax15240FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse10False00FalseFalseleft0000FalseTotalSales8102FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseTrue11False00FalseFalseright0000TrueemployeesTrueTrueTrueTrueFalseTrueFalseTrueFalseTrueTrueTrueTrueTrueTrueFalse1510orders;employeesTrueFalseFalse4ascadministrator.png0False1FalsehorizontalFalseFalse25%-1EmployeeID400TrueFalseFalseTrueFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse0False00FalseFalseright0000FalseTitleOfCourtesy15500FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse4False00FalseFalseleft0000FalseAllowed file types: jpg, jpeg, gif, png, webp]]>Photo15400FalseFalseFalseFalseFalseFalseFalseFalse60False0TrueTrueFalseTrue5050TrueTrueFalse250250FalseFalse15360000jpg|jpeg|gif|png|webpTrueFalseTrueFalseFalse01FalseFalseFalseFalse14False00FalseFalseleft0000FalseLastName15500FalseFalseFalseFalseFalseFalseFalseFalse100False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse1False00FalseFalseleft0000FalseFirstName15100FalseFalseFalseFalseFalseFalseFalseFalse100False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse2False00FalseFalseleft0000FalseTitle15300FalseFalseFalseFalseFalseFalseFalseFalse200False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse3False00FalseFalseleft0000FalseBirthDate900FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse5False00FalseFalseleft0000FalseHireDate900FalseFalseFalseFalseFalseFalseFalseFalse100False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse6False00FalseFalseleft0000FalseAddress15500FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse7False00FalseFalseleft0000FalseCity15150FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse8False00FalseFalseleft0000FalseRegion15150FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse9False00FalseFalseleft0000FalsePostalCode15100FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse10False00FalseFalseleft0000FalseCountry15150FalseFalseFalseFalseFalseFalseFalseFalse120False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse11False00FalseFalseleft0000FalseHomePhone15240FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse12False00FalseFalseleft0000FalseExtension1540FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse13False00FalseFalseleft0000FalseNotes1800FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse15True00FalseFalseleft0000FalseReportsTo400FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseLastNameFirstNameEmployeeIDemployeesTrueFalseFalse00FalseFalseTrueFalse16False00FalseTrueleft0000FalseAge400FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseTrue17False00FalseFalseright0000TrueFalse1510orders;employeesTrueFalseFalse4ascadministrator.png0False1FalsehorizontalFalseFalse25%-1EmployeeID400TrueFalseFalseTrueFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse0False00FalseFalseright0000FalseTitleOfCourtesy15500FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse1False00FalseFalseleft0000FalseAllowed file types: jpg, jpeg, gif, png, webp]]>Photo15400FalseFalseFalseFalseFalseFalseFalseFalse60False0TrueTrueFalseTrue5050TrueTrueFalse250250FalseFalse15360000jpg|jpeg|gif|png|webpTrueFalseTrueFalseFalse01FalseFalseFalseFalse2False00FalseFalseleft0000FalseLastName15500FalseFalseFalseFalseFalseFalseFalseFalse100False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse3False00FalseFalseleft0000FalseFirstName15100FalseFalseFalseFalseFalseFalseFalseFalse100False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse4False00FalseFalseleft0000FalseTitle15300FalseFalseFalseFalseFalseFalseFalseFalse200False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse5False00FalseFalseleft0000FalseBirthDate900FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse6False00FalseFalseleft0000FalseHireDate900FalseFalseFalseFalseFalseFalseFalseFalse100False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse7False00FalseFalseleft0000FalseAddress15500FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse8False00FalseFalseleft0000FalseCity15150FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse9False00FalseFalseleft0000FalseRegion15150FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse10False00FalseFalseleft0000FalsePostalCode15100FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse11False00FalseFalseleft0000FalseCountry15150FalseFalseFalseFalseFalseFalseFalseFalse120False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse12False00FalseFalseleft0000FalseHomePhone15240FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse13False00FalseFalseleft0000FalseExtension1540FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse14False00FalseFalseleft0000FalseNotes1800FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse15True00FalseFalseleft0000FalseReportsTo400FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseLastNameFirstNameEmployeeIDemployeesTrueFalseFalse00FalseFalseTrueFalse16False00FalseTrueleft0000FalseAge400FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseTrue17False00FalseFalseright0000TrueTotalSales8102FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseTrue18False00FalseFalseright0000True
@@ -27,24 +27,24 @@ WHERE `employees`.`EmployeeID`='%ID%']]>[{"report_hash":"xomvtnu0ki8hdruoeqbe","title":"Country sales count","table":"orders","table_index":2,"label":"ShipCountry","caption1":"Ship Country","caption2":"Count of Orders","group_function":"count","group_function_field":null,"group_array":[],"look_up_table":"customers","look_up_value":"Country","label_field_index":"15","report_header_url":"","report_footer_url":"","data_table_section":1,"barchart_section":1,"piechart_section":1,"join_statment":"","date_separator":"\/"}]ordersTrueTrueFalseTrueFalseTrueFalseTrueFalseTrueTrueTrueTrueTrueTrueFalse11010order_detailsTrueFalseFalse1desccash_register.png0False0TruehorizontalFalseFalse25%-1OrderID400TrueFalseFalseTrueFalseFalseFalseFalse75False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse0False00FalseFalseright0000FalseStatus152000FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseTrue16False00FalseFalseleft0000TrueFalse11010order_detailsTrueFalseFalse1desccash_register.png0False0TruehorizontalFalseFalse25%-1OrderID400TrueFalseFalseTrueFalseFalseFalseFalse75False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse0False00FalseFalseright0000FalseStatus152000FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseTrue1False00FalseFalseleft0000True= CURRENT_DATE THEN 'New' WHEN `ShippedDate` IS NOT NULL THEN 'Shipped' WHEN `ShippedDate` IS NULL AND `RequiredDate` < CURRENT_DATE THEN 'Late' ELSE `Status` -- Preserve the existing status if none of the conditions match END FROM `orders` -WHERE `OrderID`='%ID%']]>CustomerID1550FalseFalseFalseFalseFalseFalseFalseFalse200False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseCompanyNameCustomerIDcustomersTrueFalseFalse01FalseFalseFalseFalse1False00FalseFalseleft0000FalseEmployeeID400FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseLastNameFirstNameEmployeeIDemployeesTrueFalseFalse01FalseFalseFalseFalse2False00FalseFalseleft0000FalseOrderDate900FalseFalseFalseFalseFalseFalseFalseFalse100False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse3False00FalseFalseleft0000FalseOrderTime1200FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse14False00FalseFalseleft0000FalseRequiredDate900FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse4False00FalseFalseleft0000FalseShippedDate900FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse5False00FalseFalseleft0000FalseShipVia4110FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseCompanyNameShipperIDshippersTrueFalseFalse01FalseFalseFalseFalse6False00FalseFalseleft0000FalseFreight6102FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse7False00FalseFalseright0000FalseShipName1550FalseFalseFalseFalseFalseFalseFalseFalse200False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseCompanyNameCustomerIDcustomersTrueFalseTrue01TrueFalseFalseFalse8False00FalseFalseleft0000FalseShipAddress1550FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseAddressCustomerIDcustomersTrueFalseTrue01TrueFalseFalseFalse9False00FalseFalseleft0000FalseShipCity1550FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseCityCustomerIDcustomersTrueFalseTrue01TrueFalseFalseFalse10False00FalseFalseleft0000FalseShipRegion1550FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseRegionCustomerIDcustomersTrueFalseTrue01TrueFalseFalseFalse11False00FalseFalseleft0000FalseShipPostalCode1550FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalsePostalCodeCustomerIDcustomersTrueFalseTrue01TrueFalseFalseFalse12False00FalseFalseleft0000FalseShipCountry1550FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseCountryCustomerIDcustomersTrueFalseTrue01FalseFalseFalseFalse13False00FalseFalseleft0000Falseadded_by15400FalseFalseFalseFalseFalseFalseFalseFalse]]>150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseTrue11False00FalseFalseleft0000Falseadded_date900FalseFalseFalseFalseFalseFalseFalseFalse]]>150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseTrue0False00FalseFalseleft0000FalseTotal8102FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseTrue15False00FalseFalseright0000TrueCustomerID1550FalseFalseFalseFalseFalseFalseFalseFalse200False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseCompanyNameCustomerIDcustomersTrueFalseFalse01FalseFalseFalseFalse2False00FalseFalseleft0000FalseEmployeeID400FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseLastNameFirstNameEmployeeIDemployeesTrueFalseFalse01FalseFalseFalseFalse3False00FalseFalseleft0000FalseOrderDate900FalseFalseFalseFalseFalseFalseFalseFalse100False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse4False00FalseFalseleft0000FalseOrderTime1200FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse5False00FalseFalseleft0000FalseRequiredDate900FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse6False00FalseFalseleft0000FalseShippedDate900FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse7False00FalseFalseleft0000FalseShipVia4110FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseCompanyNameShipperIDshippersTrueFalseFalse01FalseFalseFalseFalse8False00FalseFalseleft0000FalseFreight6102FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse9False00FalseFalseright0000FalseShipName1550FalseFalseFalseFalseFalseFalseFalseFalse200False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseCompanyNameCustomerIDcustomersTrueFalseTrue01TrueFalseFalseFalse10False00FalseFalseleft0000FalseShipAddress1550FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseAddressCustomerIDcustomersTrueFalseTrue01TrueFalseFalseFalse11False00FalseFalseleft0000FalseShipCity1550FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseCityCustomerIDcustomersTrueFalseTrue01TrueFalseFalseFalse12False00FalseFalseleft0000FalseShipRegion1550FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseRegionCustomerIDcustomersTrueFalseTrue01TrueFalseFalseFalse13False00FalseFalseleft0000FalseShipPostalCode1550FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalsePostalCodeCustomerIDcustomersTrueFalseTrue01TrueFalseFalseFalse14False00FalseFalseleft0000FalseShipCountry1550FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseCountryCustomerIDcustomersTrueFalseTrue01FalseFalseFalseFalse15False00FalseFalseleft0000Falseadded_by15400FalseFalseFalseFalseFalseFalseFalseFalse]]>150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseTrue16False00FalseFalseleft0000Falseadded_date900FalseFalseFalseFalseFalseFalseFalseFalse]]>150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseTrue17False00FalseFalseleft0000FalseTotal8102FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseTrue18False00FalseFalseright0000True
order_detailsTrueTrueFalseTrueFalseTrueFalseTrueFalseTrueTrueTrueTrueFalseTrueFalse11010TrueTrueTrue2ascapplication_form_magnify.png0False0FalsehorizontalFalseFalse25%-1odID400TrueFalseFalseTrueFalseTrueFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse5False00FalseFalseright0000Falseauto-complete. Type part of the order number to see a list of matching orders to choose from.]]>OrderID400FalseFalseFalseFalseFalseFalseFalseFalse70False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseOrderIDOrderIDordersTrueFalseFalse01FalseFalseFalseFalse0False00FalseFalseright0000FalseCategory400FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseCategoryIDSupplierIDProductIDproductsTrueFalseTrue01FalseFalseFalseFalse6False00FalseFalseleft0000FalseProductID400FalseFalseFalseFalseFalseFalseFalseFalse350False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseProductNameProductIDproductsFalseFalse11010TrueTrueTrue2ascapplication_form_magnify.png0False0FalsehorizontalFalseFalse25%-1odID400TrueFalseFalseTrueFalseTrueFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse0False00FalseFalseright0000Falseauto-complete. Type part of the order number to see a list of matching orders to choose from.]]>OrderID400FalseFalseFalseFalseFalseFalseFalseFalse70False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseOrderIDOrderIDordersTrueFalseFalse01FalseFalseFalseFalse1False00FalseFalseright0000FalseCategory400FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseCategoryIDSupplierIDProductIDproductsTrueFalseTrue01FalseFalseFalseFalse2False00FalseFalseleft0000FalseProductID400FalseFalseFalseFalseFalseFalseFalseFalse350False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseProductNameProductIDproductsFalseFalseFalse01FalseFalseFalseFalse1False00FalseFalseleft0000FalseUnitPrice6102FalseFalseFalseFalseFalseFalseFalseFalse75False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse2False00FalseFalseright0000FalseQuantity200FalseFalseFalseFalseFalseFalseTrueFalse75False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse3False00FalseFalseright0000FalseDiscount6102FalseFalseFalseFalseFalseFalseFalseFalse75False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse4False00FalseFalseright0000FalseSubtotal8102FalseFalseFalseFalseFalseFalseTrueFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseTrue7False00FalseFalseright0000TrueFalseFalse01FalseFalseFalseFalse3False00FalseFalseleft0000FalseUnitPrice6102FalseFalseFalseFalseFalseFalseFalseFalse75False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse4False00FalseFalseright0000FalseQuantity200FalseFalseFalseFalseFalseFalseTrueFalse75False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse5False00FalseFalseright0000FalseDiscount6102FalseFalseFalseFalseFalseFalseFalseFalse75False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse6False00FalseFalseright0000FalseSubtotal8102FalseFalseFalseFalseFalseFalseTrueFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseTrue7False00FalseFalseright0000True
3:2:9:9001:productsTrueTrueFalseTrueFalseTrueFalseTrueFalseTrueTrueTrueTrueTrueTrueFalse11010order_detailsTrueFalseFalse2aschandbag.png0False1TruehorizontalFalseFalse25%-1ProductID400TrueFalseFalseTrueFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse0False00FalseFalseright0000FalseProductName15500FalseFalseFalseFalseFalseFalseFalseFalse250False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse1False00FalseFalseleft0000FalseSupplierID4110FalseFalseFalseFalseFalseFalseFalseFalse200False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseCompanyNameSupplierIDsuppliersTrueFalseFalse01FalseFalseFalseFalse2False00FalseFalseleft0000FalseCategoryID400FalseFalseFalseFalseFalseFalseFalseFalse120False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseCategoryNameCategoryIDcategoriesTrueFalseFalse01FalseFalseFalseFalse3False00FalseFalseleft0000FalseQuantityPerUnit15500FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse4False00FalseFalseleft0000FalseUnitPrice6102FalseFalseFalseFalseFalseFalseFalseFalse70False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse5False00FalseFalseright0000FalseUnitsInStock200FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse6False00FalseFalseright0000FalseUnitsOnOrder260FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse7False00FalseFalseright0000FalseReorderLevel200FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse8False00FalseFalseright0000FalseDiscontinued100FalseFalseFalseFalseFalseFalseFalseFalse100False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse9False00TrueFalseright0000FalseTotalSales8102FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseTrue10False00FalseFalseright0000TrueAllowed file types: txt, doc, docx, docm, odt, pdf, rtf]]>TechSheet15400FalseFalseFalseFalseFalseFalseFalseFalse150False0TrueFalseFalseFalse00FalseFalseFalse00TrueTrue2048000txt|doc|docx|docm|odt|pdf|rtfTrueFalseTrueFalseFalse01TrueFalseFalseFalse11False21FalseFalseleft0000False
categoriesTrueTrueTrueTrueFalseTrueFalseTrueFalseTrueTrueTrueTrueTrueTrueFalse1510productsTrueFalseFalse1descaward_star_bronze_1.png0False1FalsehorizontalFalseFalse50%-1CategoryID400TrueFalseFalseTrueFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse0False00FalseFalseright0000FalseAllowed file types: jpg, jpeg, gif, png, webp]]>Picture15400FalseFalseFalseFalseFalseFalseFalseFalse75False0TrueTrueFalseTrue100100TrueFalseTrue250250FalseFalse204800jpg|jpeg|gif|png|webpTrueFalseTrueFalseFalse01FalseFalseFalseFalse3False00FalseFalseleft0000FalseCategoryName15500FalseFalseFalseFalseTrueFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse1False00FalseFalseleft0000FalseDescription1800FalseFalseFalseFalseFalseFalseFalseFalse500False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse2True00FalseFalseleft0000False
1:5:8:9001:suppliersTrueTrueTrueTrueFalseTrueFalseTrueFalseTrueTrueTrueTrueTrueTrueFalse1510productsTrueFalseFalse1descaward_star_bronze_1.png0False1FalsehorizontalFalseFalse50%-1CategoryID400TrueFalseFalseTrueFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse0False00FalseFalseright0000FalseAllowed file types: jpg, jpeg, gif, png, webp]]>Picture15400FalseFalseFalseFalseFalseFalseFalseFalse75False0TrueTrueFalseTrue100100TrueFalseTrue250250FalseFalse204800jpg|jpeg|gif|png|webpTrueFalseTrueFalseFalse01FalseFalseFalseFalse1False00FalseFalseleft0000FalseCategoryName15500FalseFalseFalseFalseTrueFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse2False00FalseFalseleft0000FalseDescription1800FalseFalseFalseFalseFalseFalseFalseFalse500False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse3True00FalseFalseleft0000False
1:5:8:9001:suppliersTrueTrueTrueTrueFalseTrueFalseTrueFalseTrueTrueTrueTrueTrueTrueFalse11010productsTrueFalseFalse2asccar.png0False1FalsehorizontalFalseFalse25%-1SupplierID4110TrueFalseFalseTrueFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse0False00FalseFalseright0000FalseCompanyName15500FalseFalseFalseFalseFalseFalseFalseFalse250False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse1False00FalseFalseleft0000FalseContactName15300FalseFalseFalseFalseFalseFalseFalseFalse130False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse2False00FalseFalseleft0000FalseContactTitle15300FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse3False00FalseFalseleft0000FalseAddress15500FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse4False00FalseFalseleft0000FalseCity15150FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse5False00FalseFalseleft0000FalseRegion15150FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse6False00FalseFalseleft0000FalsePostalCode15100FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse7False00FalseFalseleft0000FalseCountry15500FalseFalseFalseFalseFalseFalseFalseFalse120False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse8False00FalseFalseleft0000FalsePhone15240FalseFalseFalseFalseFalseFalseFalseFalse120False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse9False00FalseFalseleft0000FalseFax15240FalseFalseFalseFalseFalseFalseFalseFalse120False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse10False00FalseFalseleft0000FalseHomePage1800FalseFalseFalseFalseFalseFalseFalseFalse50False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse11False21FalseFalseleft0000False
1:2:shippersTrueTrueTrueTrueFalseTrueFalseTrueFalseTrueTrueTrueTrueTrueTrueFalse11010ordersFalseFalseFalse2asccart.png0False1FalsehorizontalFalseFalse25%-1ShipperID4110TrueFalseFalseTrueFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01TrueFalseFalseFalse0False00FalseFalseright0000FalseCompanyName15400FalseFalseTrueFalseTrueFalseFalseFalse400False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse1False00FalseFalseleft0000FalsePhone15240FalseFalseFalseFalseFalseFalseFalseFalse150False0FalseFalseFalseFalse00FalseFalseFalse00FalseFalse0FalseFalseTrueFalseFalse01FalseFalseFalseFalse2False00FalseFalseleft0000False
 diff --git a/app/admin/incFunctions.php b/app/admin/incFunctions.php index 9f1eb0b..2939092 100644 --- a/app/admin/incFunctions.php +++ b/app/admin/incFunctions.php @@ -81,6 +81,7 @@ request_outside_admin_folder() -- returns true if currently executing script is outside admin folder, false otherwise. breakpoint(__FILE__, __LINE__, $msg) -- if DEBUG_MODE enabled, logs a message to {app_dir}/breakpoint.csv, if $msg is array, it will be converted to str via json_encode denyAccess($msg) -- Send a 403 Access Denied header, with an optional message then die + getUploadDir($dir) -- if dir is empty, returns upload dir configured in defaultLang.php, else returns $dir. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ ######################################################################## @@ -3003,7 +3004,7 @@ function parseTemplate($template) { function getUploadDir($dir = '') { if($dir == '') $dir = config('adminConfig')['baseUploadPath']; - return rtrim($dir, '\\/') . '/'; + return rtrim($dir, '\\/') . DIRECTORY_SEPARATOR; } ######################################################### function bgStyleToClass($html) { diff --git a/app/admin/pageEditGroup.php b/app/admin/pageEditGroup.php index 48679e7..f818cd3 100644 --- a/app/admin/pageEditGroup.php +++ b/app/admin/pageEditGroup.php @@ -127,6 +127,13 @@ $groupID = 0; } } + +// get all groups and their permissions +$groupPermissions = []; +$res = sql("SELECT * FROM `membership_grouppermissions`", $eo); +while($row = db_fetch_assoc($res)) { + $groupPermissions[$row['groupID']][$row['tableName']] = $row; +} ?> @@ -145,7 +152,7 @@

- ', '' . html_attr($name) . '', $Translation['edit group']) : $Translation['add new group']); ?> + \'?/', '' . html_attr($name) . '', $Translation['edit group']) : $Translation['add new group']); ?>
@@ -179,23 +186,31 @@ -
- -
-
- -
-
-
-
+
+
+ +
+
+ +
+ +
+
+ +
+
+
+ +
+
@@ -252,12 +267,6 @@
-
-
- -
-
-
@@ -268,7 +277,29 @@
- + @@ -347,7 +378,7 @@ -

+

+
+ +
+ + +
+
+
📋
+
+
- > + > @@ -360,14 +391,13 @@
- +
@@ -376,6 +406,8 @@ diff --git a/app/admin/pageServerStatus.php b/app/admin/pageServerStatus.php index 458f2e0..b0d033f 100644 --- a/app/admin/pageServerStatus.php +++ b/app/admin/pageServerStatus.php @@ -1,6 +1,6 @@ ", '', $templateCode); } diff --git a/app/common.js b/app/common.js index e29ffec..ad4dbad 100644 --- a/app/common.js +++ b/app/common.js @@ -1,6 +1,6 @@ var AppGini = AppGini || {}; -AppGini.version = 24.13; +AppGini.version = 24.14; /* initials and fixes */ jQuery(function() { @@ -317,6 +317,31 @@ jQuery(function() { $j(this).siblings('.sql-query-copier').click(); }) + // in TVP, disable lightbox for images + if($j('#current_view').val() == 'TVP') { + const links = document.querySelectorAll('a[data-lightbox]'); + links.forEach(function(link) { + const img = link.innerHTML; // Get the inner HTML of the tag, which should be an element + link.parentNode.replaceChild(link.firstChild, link); // Replace the tag with its child + }); + } + + // render the DV layout toolbar + AppGini.renderDVLayoutToolbar(); + + // handle click on layout toolbar buttons + $j('.detail_view-layout').on('click', 'a', function(e) { + e.preventDefault(); + + if($j(this).hasClass('switch-to-single-column-layout')) { + AppGini.applySingleColumnLayout(); + } else if($j(this).hasClass('switch-to-double-column-layout')) { + AppGini.applyDoubleColumnLayout(); + } else if($j(this).hasClass('switch-to-triple-column-layout')) { + AppGini.applyTripleColumnLayout(); + } + }); + }); /* show/hide TV action buttons based on whether records are selected or not */ @@ -917,7 +942,7 @@ function mass_change_owner(t, ids) { } function add_more_actions_link() { - window.open('https://bigprof.com/appgini/help/advanced-topics/hooks/multiple-record-batch-actions?r=appgini-action-menu'); + window.open('https://bigprof.com/appgini/help/advanced-topics/hooks/multiple-record-batch-actions/?r=appgini-action-menu'); } /* detect current screen size (xs, sm, md or lg) */ @@ -2275,7 +2300,7 @@ AppGini.showKeyboardShortcuts = (e) => { */ if(typeof(_noShortcutsReference) == 'undefined') $j( - '' + + '' + AppGini.Translate._map['keyboard shorcuts reference'] + '' ).appendTo('#' + modalId + ' .modal-footer'); @@ -2594,3 +2619,108 @@ AppGini.localeFormat = (num, isInt, locale) => { // return the number formatted in the locale return new Intl.NumberFormat(locale).format(parseFloat(num.replace(decimalSeparator, '.'))); } +AppGini.storedLayout = (val) => { + const view = $j('[name="current_view"]').val(); + + if(val !== undefined) { + localStorage.setItem(`Northwind.${AppGini.currentTableName()}.${view}.layout`, val); + } + return localStorage.getItem(`Northwind.${AppGini.currentTableName()}.${view}.layout`); +} + +AppGini.renderDVLayoutToolbar = () => { + // already rendered? return + if($j('.detail_view-layout').length) return; + + // if not in detail view, return + if(!$j('.detail_view').length) return; + + // if we have less than 3 divs in the first fieldset, return + if($j('fieldset.form-horizontal').first().children('div').length < 3) return; + + // create the layout toolbar above 1st fieldset + $j('fieldset.form-horizontal').first().before(` +
+ + + +
+ `); + + // retrieve user preference from local storage + const dvLayout = AppGini.storedLayout(); + + // apply user preference if found + const windowWidth = $j(window).width(); + if(dvLayout == 'double-column-layout' && windowWidth >= 1200) { + AppGini.applyDoubleColumnLayout(); + } else if(dvLayout == 'triple-column-layout' && windowWidth >= 1700) { + AppGini.applyTripleColumnLayout(); + } +} + +AppGini.applySingleColumnLayout = () => { + // move all divs inside second and third fieldsets to the first fieldset + $j('fieldset.form-horizontal').slice(1).children('div').appendTo($j('fieldset.form-horizontal').first()); + + // remove second and third fieldsets + $j('fieldset.form-horizontal').slice(1).remove(); + + // remove .double-column-layout and .triple-column-layout classes from all fieldsets + $j('fieldset.form-horizontal').removeClass('double-column-layout triple-column-layout'); + + // store preference in local storage + AppGini.storedLayout('single-column-layout'); +} + +AppGini.applyDoubleColumnLayout = () => { + // if already in double-column layout, return + if($j('fieldset.form-horizontal').first().hasClass('double-column-layout')) return; + + // if already in triple-column layout, switch to double-column layout + if($j('fieldset.form-horizontal').first().hasClass('triple-column-layout')) { + AppGini.applySingleColumnLayout(); + } + + // create a new fieldset for the third column + $j('fieldset.form-horizontal').first().after('
'); + + // add .double-column-layout class to all fieldsets + $j('fieldset').addClass('form-horizontal double-column-layout'); + + // move half of the divs from the first fieldset to the second fieldset + const half = Math.ceil($j('fieldset.form-horizontal').first().children('div').length / 2); + $j('fieldset.form-horizontal').first().children('div').slice(half).appendTo($j('fieldset.form-horizontal').first().next()); + + // store preference in local storage + AppGini.storedLayout('double-column-layout'); +} + +AppGini.applyTripleColumnLayout = () => { + // if already in triple-column layout, return + if($j('fieldset.form-horizontal').first().hasClass('triple-column-layout')) return; + + // if already in double-column layout, switch to triple-column layout + if($j('fieldset.form-horizontal').first().hasClass('double-column-layout')) { + AppGini.applySingleColumnLayout(); + } + + // create a new fieldset for the second column + $j('fieldset.form-horizontal').first().after('
'); + + // create a new fieldset for the third column + $j('fieldset.form-horizontal').first().after('
'); + + // add .triple-column-layout class to all fieldsets + $j('fieldset').addClass('form-horizontal triple-column-layout'); + + // move 1/3 of the divs from the first fieldset to the second fieldset + const third = Math.ceil($j('fieldset.form-horizontal').first().children('div').length / 3); + $j('fieldset.form-horizontal').first().children('div').slice(third * 2).appendTo($j('fieldset.form-horizontal').first().next().next()); + $j('fieldset.form-horizontal').first().children('div').slice(third).appendTo($j('fieldset.form-horizontal').first().next()); + + // store preference in local storage + AppGini.storedLayout('triple-column-layout'); +} + + diff --git a/app/customers_dml.php b/app/customers_dml.php index 8e5fbbc..b1178f9 100644 --- a/app/customers_dml.php +++ b/app/customers_dml.php @@ -413,7 +413,7 @@ class="btn btn-default" $pt_perm = getTablePermissions($ptfc[0]); // process foreign key links - if($pt_perm['view'] || $pt_perm['edit']) { + if(($pt_perm['view'] && isDetailViewEnabled($ptfc[0])) || $pt_perm['edit']) { $templateCode = str_replace("<%%PLINK({$luf})%%>", '', $templateCode); } diff --git a/app/datalist.php b/app/datalist.php index f90b8da..eaddba2 100644 --- a/app/datalist.php +++ b/app/datalist.php @@ -166,7 +166,7 @@ function Render() { $setSelectedIDPreviousPage = $setSelectedIDNextPage = $previousRecordDV = $nextRecordDV = null; - if($SelectedID && !$Embedded && $this->AllowDVNavigation) { + if($SelectedID /*&& !$Embedded*/ && $this->AllowDVNavigation) { $setSelectedIDPreviousPage = !empty(Request::val('setSelectedIDPreviousPage')); $setSelectedIDNextPage = !empty(Request::val('setSelectedIDNextPage')) && !$setSelectedIDPreviousPage; $previousRecordDV = !empty(Request::val('previousRecordDV')) && !$setSelectedIDPreviousPage && !$setSelectedIDNextPage; @@ -198,6 +198,7 @@ function Render() { if($this->Permissions['edit'] || $this->Permissions['delete']) { $this->AllowSelection = 1; } elseif(!$this->AllowSelection) { + $this->AllowPrintingDV = 0; $SelectedID = ''; $PrintDV = ''; } @@ -659,7 +660,7 @@ function Render() { } // end of table view navigation code - if($SelectedID && $RecordCount && !$Embedded && $this->AllowDVNavigation) { + if($SelectedID && $RecordCount /*&& !$Embedded*/ && $this->AllowDVNavigation) { // in DV, if user is navigating to prev record, // and current one is first record in page, // navigate to previous page (unless this is the first page) @@ -679,7 +680,7 @@ function Render() { $fieldCountTV = count($this->QueryFieldsTV); $indexOfSelectedID = null; - if($SelectedID && count($tvRecords) && !$Embedded) { + if($SelectedID && count($tvRecords) /*&& !$Embedded*/) { if($setSelectedIDPreviousPage) // set SelectedID to pk of last item in $tvRecords $indexOfSelectedID = count($tvRecords) - 1; @@ -854,7 +855,7 @@ function Render() { } // begin table and display table title - if(!$this->HideTableView && !($dvprint_x && $this->AllowSelection && $SelectedID) && !$PrintDV && !$Embedded) { + if(!$this->HideTableView && !($dvprint_x && $this->AllowSelection && $SelectedID) && !$PrintDV && !($Embedded && $delete_x)) { if(getLoggedAdmin() && $this->AllowAdminShowSQL) { $this->HTML .= ''; $this->HTML .= ''; @@ -1225,7 +1226,7 @@ function Render() { $this->TemplateDVP ]); - if($this->Permissions['view'] && $this->AllowDVNavigation && !$Embedded) $this->addDVNavigation( + if($this->Permissions['view'] && $this->AllowDVNavigation /*&& !$Embedded*/) $this->addDVNavigation( $dvCode, $SelectedID, // array of PKs of TV records diff --git a/app/defaultLang.php b/app/defaultLang.php index 951d943..c27706f 100644 --- a/app/defaultLang.php +++ b/app/defaultLang.php @@ -880,4 +880,8 @@ 'db server status' => 'Database server status', 'db client status' => 'Database client status', 'date and time info' => 'Date and time info', + + // Added in 24.14 + 'Copy permissions from another group' => 'Copy permissions from another group', + 'revert permissions' => 'Revert permissions', ]; diff --git a/app/definitions.php b/app/definitions.php index 8ae0a82..ea22193 100644 --- a/app/definitions.php +++ b/app/definitions.php @@ -3,7 +3,7 @@ @define('SESSION_NAME', 'Northwind'); @define('APP_TITLE', 'Northwind'); @define('APP_DIR', __DIR__); - @define('APP_VERSION', '24.13'); + @define('APP_VERSION', '24.14'); @define('maxSortBy', 4); @define('empty_lookup_value', '{empty_value}'); @define('MULTIPLE_SUPER_ADMINS', false); @@ -42,3 +42,4 @@ @define('MULTI_TENANTS', false); @define('FORCE_SETUP_CAPTCHA', true); + @define('HOMEPAGE_NAVMENUS', false); diff --git a/app/dynamic.css b/app/dynamic.css index c276adc..14de414 100644 --- a/app/dynamic.css +++ b/app/dynamic.css @@ -907,3 +907,52 @@ td.row .img-responsive { .modal-top-spacer { height: 2rem; } + +/* Styling for detail view layout toobar and detail view columns */ +.detail_view-layout { + display: none; + margin: 0 0 1em 0; + text-align: right; +} +.detail_view-layout a { + outline: none; +} +.theme-rtl .detail_view-layout { + text-align: left; +} +.switch-to-single-column-layout, .switch-to-double-column-layout, .switch-to-triple-column-layout { + display: none; +} + +@media (min-width: 1200px) { + .detail_view-layout { + display: block; + } + .switch-to-single-column-layout, .switch-to-double-column-layout { + display: inline-block; + } + .double-column-layout { + width: 50%; + float: left; + padding: 0 1em 0 0; + } + .theme-rtl .double-column-layout { + float: right; + padding: 0 0 0 1em; + } +} + +@media (min-width: 1700px) { + .switch-to-triple-column-layout { + display: inline-block; + } + .triple-column-layout { + width: 33.33%; + float: left; + padding: 0 1em 0 0; + } + .theme-rtl .triple-column-layout { + float: right; + padding: 0 0 0 1em; + } +} diff --git a/app/employees_dml.php b/app/employees_dml.php index 07608d3..c3785f1 100644 --- a/app/employees_dml.php +++ b/app/employees_dml.php @@ -567,7 +567,7 @@ class="btn btn-default" $pt_perm = getTablePermissions($ptfc[0]); // process foreign key links - if($pt_perm['view'] || $pt_perm['edit']) { + if(($pt_perm['view'] && isDetailViewEnabled($ptfc[0])) || $pt_perm['edit']) { $templateCode = str_replace("<%%PLINK({$luf})%%>", '', $templateCode); } diff --git a/app/footer.php b/app/footer.php index 58256bd..6e8fd61 100644 --- a/app/footer.php +++ b/app/footer.php @@ -9,7 +9,7 @@
diff --git a/app/incCommon.php b/app/incCommon.php index 8d89c49..e4f130c 100644 --- a/app/incCommon.php +++ b/app/incCommon.php @@ -28,7 +28,6 @@ check_record_permission($table, $id, $perm = 'view') -- returns true if current user has the specified permission $perm ('view', 'edit' or 'delete') for the given recors, false otherwise NavMenus($options) -- returns the HTML code for the top navigation menus. $options is not implemented currently. StyleSheet() -- returns the HTML code for included style sheet files to be placed in the section. - getUploadDir($dir) -- if dir is empty, returns upload dir configured in defaultLang.php, else returns $dir. PrepareUploadedFile($FieldName, $MaxSize, $FileTypes={image file types}, $NoRename=false, $dir="") -- validates and moves uploaded file for given $FieldName into the given $dir (or the default one if empty) get_home_links($homeLinks, $default_classes, $tgroup) -- process $homeLinks array and return custom links for homepage. Applies $default_classes to links if links have classes defined, and filters links by $tgroup (using '*' matches all table_group values) quick_search_html($search_term, $label, $separate_dv = true) -- returns HTML code for the quick search box. @@ -327,7 +326,7 @@ function htmlUserBar() {
-
+
    @@ -572,6 +571,52 @@ function parseCode($code, $isInsert = true, $rawData = false) { ######################################################### + function parseMySQLDateTime($datetime, $altDateTime) { + // is $datetime valid? + if(mysql_datetime($datetime)) return mysql_datetime($datetime); + + if($altDateTime === '') return ''; + + // is $altDateTime valid? + if(mysql_datetime($altDateTime)) return mysql_datetime($altDateTime); + + /* parse $altDateTime */ + $matches = []; + if(!preg_match('/^([+-])(\d+)(s|m|h|d)(0)?$/', $altDateTime, $matches)) + return ''; + + $sign = ($matches[1] == '-' ? -1 : 1); + $unit = $matches[3]; + $qty = $matches[2]; + + // m0 means increment minutes, set seconds to 0 + // h0 means increment hours, set minutes and seconds to 0 + // d0 means increment days, set time to 00:00:00 + $zeroTime = $matches[4] == '0'; + + switch($unit) { + case 's': + $seconds = $qty * $sign; + break; + case 'm': + $seconds = $qty * 60 * $sign; + if($zeroTime) return @date('Y-m-d H:i:00', @time() + $seconds); + break; + case 'h': + $seconds = $qty * 3600 * $sign; + if($zeroTime) return @date('Y-m-d H:00:00', @time() + $seconds); + break; + case 'd': + $seconds = $qty * 86400 * $sign; + if($zeroTime) return @date('Y-m-d 00:00:00', @time() + $seconds); + break; + } + + return @date('Y-m-d H:i:s', @time() + $seconds); + } + + ######################################################### + function addFilter($index, $filterAnd, $filterField, $filterOperator, $filterValue) { // validate input if($index < 1 || $index > 80 || !is_int($index)) return false; @@ -1350,3 +1395,11 @@ function getChildTables($parentTable, $skipPermissions = false, $filterByPermiss return $childTables; } + + ######################################################### + + function isDetailViewEnabled($tn) { + $tables = ['customers', 'employees', 'orders', 'order_details', 'products', 'categories', 'suppliers', 'shippers', ]; + return in_array($tn, $tables); + } + diff --git a/app/language.php b/app/language.php index 6fe9531..5108d93 100644 --- a/app/language.php +++ b/app/language.php @@ -907,4 +907,8 @@ 'db server status' => 'Database server status', 'db client status' => 'Database client status', 'date and time info' => 'Date and time info', + + // Added in 24.14 + 'Copy permissions from another group' => 'Copy permissions from another group', + 'revert permissions' => 'Revert permissions', ]; \ No newline at end of file diff --git a/app/membership_profile.php b/app/membership_profile.php index 41a37a7..efcd205 100644 --- a/app/membership_profile.php +++ b/app/membership_profile.php @@ -97,7 +97,7 @@ /* get profile info */ /* $mi already contains the profile info, as documented at: - https://bigprof.com/appgini/help/working-with-generated-web-database-application/hooks/memberInfo + https://bigprof.com/appgini/help/advanced-topics/hooks/memberInfo-array/ custom field names are stored in $adminConfig['custom1'] to $adminConfig['custom4'] */ diff --git a/app/order_details_dml.php b/app/order_details_dml.php index 6c85607..acf5222 100644 --- a/app/order_details_dml.php +++ b/app/order_details_dml.php @@ -536,7 +536,7 @@ class="btn btn-default" $pt_perm = getTablePermissions($ptfc[0]); // process foreign key links - if($pt_perm['view'] || $pt_perm['edit']) { + if(($pt_perm['view'] && isDetailViewEnabled($ptfc[0])) || $pt_perm['edit']) { $templateCode = str_replace("<%%PLINK({$luf})%%>", '', $templateCode); } diff --git a/app/orders_dml.php b/app/orders_dml.php index 4cf557e..6bda959 100644 --- a/app/orders_dml.php +++ b/app/orders_dml.php @@ -729,7 +729,7 @@ class="btn btn-default" $pt_perm = getTablePermissions($ptfc[0]); // process foreign key links - if($pt_perm['view'] || $pt_perm['edit']) { + if(($pt_perm['view'] && isDetailViewEnabled($ptfc[0])) || $pt_perm['edit']) { $templateCode = str_replace("<%%PLINK({$luf})%%>", '', $templateCode); } diff --git a/app/products_dml.php b/app/products_dml.php index b104b37..fcac2f5 100644 --- a/app/products_dml.php +++ b/app/products_dml.php @@ -601,7 +601,7 @@ class="btn btn-default" $pt_perm = getTablePermissions($ptfc[0]); // process foreign key links - if($pt_perm['view'] || $pt_perm['edit']) { + if(($pt_perm['view'] && isDetailViewEnabled($ptfc[0])) || $pt_perm['edit']) { $templateCode = str_replace("<%%PLINK({$luf})%%>", '', $templateCode); } diff --git a/app/resources/images/double-column-layout.png b/app/resources/images/double-column-layout.png new file mode 100644 index 0000000..dad8ba2 Binary files /dev/null and b/app/resources/images/double-column-layout.png differ diff --git a/app/resources/images/single-column-layout.png b/app/resources/images/single-column-layout.png new file mode 100644 index 0000000..cd868c7 Binary files /dev/null and b/app/resources/images/single-column-layout.png differ diff --git a/app/resources/images/triple-column-layout.png b/app/resources/images/triple-column-layout.png new file mode 100644 index 0000000..92a32d7 Binary files /dev/null and b/app/resources/images/triple-column-layout.png differ diff --git a/app/resources/lib/Request.php b/app/resources/lib/Request.php index a49338e..98f3954 100644 --- a/app/resources/lib/Request.php +++ b/app/resources/lib/Request.php @@ -57,6 +57,10 @@ public static function dateComponents($var, $default = '') { ); } + public static function datetime($var, $default = '') { + return parseMySQLDateTime(self::val($var), $default); + } + public static function multipleChoice($var, $default = '') { return is_array($_REQUEST[$var]) ? implode(', ', $_REQUEST[$var]) : $default; } diff --git a/app/shippers_dml.php b/app/shippers_dml.php index 4d45b5a..d878174 100644 --- a/app/shippers_dml.php +++ b/app/shippers_dml.php @@ -364,7 +364,7 @@ class="btn btn-default" $pt_perm = getTablePermissions($ptfc[0]); // process foreign key links - if($pt_perm['view'] || $pt_perm['edit']) { + if(($pt_perm['view'] && isDetailViewEnabled($ptfc[0])) || $pt_perm['edit']) { $templateCode = str_replace("<%%PLINK({$luf})%%>", '', $templateCode); } diff --git a/app/suppliers_dml.php b/app/suppliers_dml.php index 80f69ee..cadb183 100644 --- a/app/suppliers_dml.php +++ b/app/suppliers_dml.php @@ -402,7 +402,7 @@ class="btn btn-default" $pt_perm = getTablePermissions($ptfc[0]); // process foreign key links - if($pt_perm['view'] || $pt_perm['edit']) { + if(($pt_perm['view'] && isDetailViewEnabled($ptfc[0])) || $pt_perm['edit']) { $templateCode = str_replace("<%%PLINK({$luf})%%>", '', $templateCode); } diff --git a/app/templates/categories_templateTV.html b/app/templates/categories_templateTV.html index ad8f755..dcdfabb 100644 --- a/app/templates/categories_templateTV.html +++ b/app/templates/categories_templateTV.html @@ -9,6 +9,6 @@ <%%SELECT%%><%%VALUE(CategoryName)%%><%%ENDSELECT%%> <%%SELECT%%><%%VALUE(Description)%%><%%ENDSELECT%%> - + diff --git a/app/templates/categories_templateTVS.html b/app/templates/categories_templateTVS.html index dc20cde..b0bcd51 100644 --- a/app/templates/categories_templateTVS.html +++ b/app/templates/categories_templateTVS.html @@ -9,6 +9,6 @@ <%%VALUE(CategoryName)%%> <%%VALUE(Description)%%> - + diff --git a/app/templates/customers_templateTV.html b/app/templates/customers_templateTV.html index e8487b0..d303d6e 100644 --- a/app/templates/customers_templateTV.html +++ b/app/templates/customers_templateTV.html @@ -14,6 +14,6 @@ <%%SELECT%%><%%VALUE(Country)%%><%%ENDSELECT%%> <%%SELECT%%><%%VALUE(TotalSales)%%><%%ENDSELECT%%> - + diff --git a/app/templates/customers_templateTVS.html b/app/templates/customers_templateTVS.html index 27adef9..fb46e7f 100644 --- a/app/templates/customers_templateTVS.html +++ b/app/templates/customers_templateTVS.html @@ -14,6 +14,6 @@ <%%VALUE(Country)%%> <%%VALUE(TotalSales)%%> - + diff --git a/app/templates/employees_templateTV.html b/app/templates/employees_templateTV.html index a2b201a..3d56428 100644 --- a/app/templates/employees_templateTV.html +++ b/app/templates/employees_templateTV.html @@ -15,10 +15,10 @@ <%%SELECT%%><%%VALUE(Age)%%><%%ENDSELECT%%> <%%SELECT%%><%%VALUE(TotalSales)%%><%%ENDSELECT%%> - + - + diff --git a/app/templates/employees_templateTVS.html b/app/templates/employees_templateTVS.html index cead2d4..5a4d7fa 100644 --- a/app/templates/employees_templateTVS.html +++ b/app/templates/employees_templateTVS.html @@ -15,10 +15,10 @@ <%%VALUE(Age)%%> <%%VALUE(TotalSales)%%> - + - + diff --git a/app/templates/orders_templateTV.html b/app/templates/orders_templateTV.html index fef702d..0429ea8 100644 --- a/app/templates/orders_templateTV.html +++ b/app/templates/orders_templateTV.html @@ -15,6 +15,6 @@ <%%SELECT%%><%%VALUE(ShipCountry)%%><%%ENDSELECT%%> <%%SELECT%%><%%VALUE(Total)%%><%%ENDSELECT%%> - + diff --git a/app/templates/orders_templateTVS.html b/app/templates/orders_templateTVS.html index 23a86ae..b8f77a2 100644 --- a/app/templates/orders_templateTVS.html +++ b/app/templates/orders_templateTVS.html @@ -15,6 +15,6 @@ <%%VALUE(ShipCountry)%%> <%%VALUE(Total)%%> - + diff --git a/app/templates/products_templateTV.html b/app/templates/products_templateTV.html index d9d357d..2341c8b 100644 --- a/app/templates/products_templateTV.html +++ b/app/templates/products_templateTV.html @@ -13,5 +13,5 @@ <%%SELECT%%><%%VALUE(Discontinued)%%><%%ENDSELECT%%> <%%SELECT%%><%%VALUE(TotalSales)%%><%%ENDSELECT%%> - + diff --git a/app/templates/products_templateTVS.html b/app/templates/products_templateTVS.html index fdfc839..94c3022 100644 --- a/app/templates/products_templateTVS.html +++ b/app/templates/products_templateTVS.html @@ -13,5 +13,5 @@ <%%VALUE(Discontinued)%%> <%%VALUE(TotalSales)%%> - + diff --git a/app/templates/shippers_templateTV.html b/app/templates/shippers_templateTV.html index 839a01d..b5b4cf2 100644 --- a/app/templates/shippers_templateTV.html +++ b/app/templates/shippers_templateTV.html @@ -8,6 +8,6 @@ <%%SELECT%%><%%VALUE(CompanyName)%%><%%ENDSELECT%%> <%%SELECT%%><%%VALUE(Phone)%%><%%ENDSELECT%%> - + diff --git a/app/templates/shippers_templateTVS.html b/app/templates/shippers_templateTVS.html index 3015b44..6d6b51a 100644 --- a/app/templates/shippers_templateTVS.html +++ b/app/templates/shippers_templateTVS.html @@ -8,6 +8,6 @@ <%%VALUE(CompanyName)%%> <%%VALUE(Phone)%%> - + diff --git a/app/templates/suppliers_templateTV.html b/app/templates/suppliers_templateTV.html index 99acc7b..bcfaf8a 100644 --- a/app/templates/suppliers_templateTV.html +++ b/app/templates/suppliers_templateTV.html @@ -13,7 +13,7 @@ <%%SELECT%%><%%VALUE(Fax)%%><%%ENDSELECT%%> - +