diff --git a/brewman/static/partial/404.html b/brewman/static/app/404.html similarity index 100% rename from brewman/static/partial/404.html rename to brewman/static/app/404.html diff --git a/brewman/static/partial/account-detail.html b/brewman/static/app/account/account-detail.html similarity index 100% rename from brewman/static/partial/account-detail.html rename to brewman/static/app/account/account-detail.html diff --git a/brewman/static/partial/account-list.html b/brewman/static/app/account/account-list.html similarity index 100% rename from brewman/static/partial/account-list.html rename to brewman/static/app/account/account-list.html diff --git a/brewman/static/scripts/account.js b/brewman/static/app/account/account.controller.js similarity index 100% rename from brewman/static/scripts/account.js rename to brewman/static/app/account/account.controller.js diff --git a/brewman/static/scripts/attendance.js b/brewman/static/app/attendance/attendance.controller.js similarity index 100% rename from brewman/static/scripts/attendance.js rename to brewman/static/app/attendance/attendance.controller.js diff --git a/brewman/static/partial/attendance.html b/brewman/static/app/attendance/attendance.html similarity index 100% rename from brewman/static/partial/attendance.html rename to brewman/static/app/attendance/attendance.html diff --git a/brewman/static/scripts/balance-sheet.js b/brewman/static/app/balance-sheet/balance-sheet.controller.js similarity index 100% rename from brewman/static/scripts/balance-sheet.js rename to brewman/static/app/balance-sheet/balance-sheet.controller.js diff --git a/brewman/static/partial/balance-sheet.html b/brewman/static/app/balance-sheet/balance-sheet.html similarity index 100% rename from brewman/static/partial/balance-sheet.html rename to brewman/static/app/balance-sheet/balance-sheet.html diff --git a/brewman/static/scripts/cash-flow.js b/brewman/static/app/cash-flow/cash-flow.controller.js similarity index 100% rename from brewman/static/scripts/cash-flow.js rename to brewman/static/app/cash-flow/cash-flow.controller.js diff --git a/brewman/static/partial/cash-flow.html b/brewman/static/app/cash-flow/cash-flow.html similarity index 100% rename from brewman/static/partial/cash-flow.html rename to brewman/static/app/cash-flow/cash-flow.html diff --git a/brewman/static/partial/client-detail.html b/brewman/static/app/client/client-detail.html similarity index 100% rename from brewman/static/partial/client-detail.html rename to brewman/static/app/client/client-detail.html diff --git a/brewman/static/partial/client-list.html b/brewman/static/app/client/client-list.html similarity index 100% rename from brewman/static/partial/client-list.html rename to brewman/static/app/client/client-list.html diff --git a/brewman/static/scripts/client.js b/brewman/static/app/client/client.controller.js similarity index 100% rename from brewman/static/scripts/client.js rename to brewman/static/app/client/client.controller.js diff --git a/brewman/static/scripts/closing-stock.js b/brewman/static/app/closing-stock/closing-stock.controller.js similarity index 100% rename from brewman/static/scripts/closing-stock.js rename to brewman/static/app/closing-stock/closing-stock.controller.js diff --git a/brewman/static/partial/closing-stock.html b/brewman/static/app/closing-stock/closing-stock.html similarity index 100% rename from brewman/static/partial/closing-stock.html rename to brewman/static/app/closing-stock/closing-stock.html diff --git a/brewman/static/partial/cost-centre-detail.html b/brewman/static/app/cost-centre/cost-centre-detail.html similarity index 100% rename from brewman/static/partial/cost-centre-detail.html rename to brewman/static/app/cost-centre/cost-centre-detail.html diff --git a/brewman/static/partial/cost-centre-list.html b/brewman/static/app/cost-centre/cost-centre-list.html similarity index 100% rename from brewman/static/partial/cost-centre-list.html rename to brewman/static/app/cost-centre/cost-centre-list.html diff --git a/brewman/static/scripts/cost-centre.js b/brewman/static/app/cost-centre/cost-centre.controller.js similarity index 100% rename from brewman/static/scripts/cost-centre.js rename to brewman/static/app/cost-centre/cost-centre.controller.js diff --git a/brewman/static/scripts/daybook.js b/brewman/static/app/daybook/daybook.controller.js similarity index 100% rename from brewman/static/scripts/daybook.js rename to brewman/static/app/daybook/daybook.controller.js diff --git a/brewman/static/partial/daybook.html b/brewman/static/app/daybook/daybook.html similarity index 100% rename from brewman/static/partial/daybook.html rename to brewman/static/app/daybook/daybook.html diff --git a/brewman/static/scripts/employee-attendance.js b/brewman/static/app/employee/employee-attendance.controller.js similarity index 100% rename from brewman/static/scripts/employee-attendance.js rename to brewman/static/app/employee/employee-attendance.controller.js diff --git a/brewman/static/partial/employee-attendance.html b/brewman/static/app/employee/employee-attendance.html similarity index 100% rename from brewman/static/partial/employee-attendance.html rename to brewman/static/app/employee/employee-attendance.html diff --git a/brewman/static/partial/employee-detail.html b/brewman/static/app/employee/employee-detail.html similarity index 100% rename from brewman/static/partial/employee-detail.html rename to brewman/static/app/employee/employee-detail.html diff --git a/brewman/static/scripts/employee-functions.js b/brewman/static/app/employee/employee-functions.controller.js similarity index 100% rename from brewman/static/scripts/employee-functions.js rename to brewman/static/app/employee/employee-functions.controller.js diff --git a/brewman/static/partial/employee-functions.html b/brewman/static/app/employee/employee-functions.html similarity index 100% rename from brewman/static/partial/employee-functions.html rename to brewman/static/app/employee/employee-functions.html diff --git a/brewman/static/partial/employee-list.html b/brewman/static/app/employee/employee-list.html similarity index 100% rename from brewman/static/partial/employee-list.html rename to brewman/static/app/employee/employee-list.html diff --git a/brewman/static/partial/employee-service-charge.html b/brewman/static/app/employee/employee-service-charge.html similarity index 100% rename from brewman/static/partial/employee-service-charge.html rename to brewman/static/app/employee/employee-service-charge.html diff --git a/brewman/static/scripts/employee.js b/brewman/static/app/employee/employee.controller.js similarity index 100% rename from brewman/static/scripts/employee.js rename to brewman/static/app/employee/employee.controller.js diff --git a/brewman/static/partial/group-detail.html b/brewman/static/app/group/group-detail.html similarity index 100% rename from brewman/static/partial/group-detail.html rename to brewman/static/app/group/group-detail.html diff --git a/brewman/static/partial/group-list.html b/brewman/static/app/group/group-list.html similarity index 100% rename from brewman/static/partial/group-list.html rename to brewman/static/app/group/group-list.html diff --git a/brewman/static/scripts/group.js b/brewman/static/app/group/group.controller.js similarity index 100% rename from brewman/static/scripts/group.js rename to brewman/static/app/group/group.controller.js diff --git a/brewman/static/scripts/home.js b/brewman/static/app/home.controller.js similarity index 100% rename from brewman/static/scripts/home.js rename to brewman/static/app/home.controller.js diff --git a/brewman/static/partial/home.html b/brewman/static/app/home.html similarity index 100% rename from brewman/static/partial/home.html rename to brewman/static/app/home.html diff --git a/brewman/static/partial/issue-modal.html b/brewman/static/app/issue/issue-modal.html similarity index 100% rename from brewman/static/partial/issue-modal.html rename to brewman/static/app/issue/issue-modal.html diff --git a/brewman/static/scripts/issue.js b/brewman/static/app/issue/issue.controller.js similarity index 99% rename from brewman/static/scripts/issue.js rename to brewman/static/app/issue/issue.controller.js index 4f075293..92b898b6 100644 --- a/brewman/static/scripts/issue.js +++ b/brewman/static/app/issue/issue.controller.js @@ -208,7 +208,7 @@ var IssueController = ['$scope', '$routeParams', '$location', 'asDateFilter', 'v var modalInstance = $modal.open({ backdrop: true, size: 'lg', - templateUrl: '/partial/issue-modal.html', + templateUrl: '/app/issue/issue-modal.html', controller: IssueModalController, resolve: { edit: function () { diff --git a/brewman/static/partial/issue.html b/brewman/static/app/issue/issue.html similarity index 100% rename from brewman/static/partial/issue.html rename to brewman/static/app/issue/issue.html diff --git a/brewman/static/partial/journal-modal.html b/brewman/static/app/journal/journal-modal.html similarity index 100% rename from brewman/static/partial/journal-modal.html rename to brewman/static/app/journal/journal-modal.html diff --git a/brewman/static/scripts/journal.js b/brewman/static/app/journal/journal.controller.js similarity index 99% rename from brewman/static/scripts/journal.js rename to brewman/static/app/journal/journal.controller.js index 14343f24..9b15c82e 100644 --- a/brewman/static/scripts/journal.js +++ b/brewman/static/app/journal/journal.controller.js @@ -149,7 +149,7 @@ var JournalController = ['$scope', '$location', 'asDateFilter', '$uibModal', 'up var modalInstance = $modal.open({ backdrop: true, size: 'lg', - templateUrl: '/partial/journal-modal.html', + templateUrl: '/app/journal/journal-modal.html', controller: JournalModalController, resolve: { edit: function () { diff --git a/brewman/static/partial/journal.html b/brewman/static/app/journal/journal.html similarity index 100% rename from brewman/static/partial/journal.html rename to brewman/static/app/journal/journal.html diff --git a/brewman/static/scripts/ledger.js b/brewman/static/app/ledger/ledger.controller.js similarity index 100% rename from brewman/static/scripts/ledger.js rename to brewman/static/app/ledger/ledger.controller.js diff --git a/brewman/static/partial/ledger.html b/brewman/static/app/ledger/ledger.html similarity index 100% rename from brewman/static/partial/ledger.html rename to brewman/static/app/ledger/ledger.html diff --git a/brewman/static/scripts/login.js b/brewman/static/app/login/login.controller.js similarity index 100% rename from brewman/static/scripts/login.js rename to brewman/static/app/login/login.controller.js diff --git a/brewman/static/partial/login.html b/brewman/static/app/login/login.html similarity index 100% rename from brewman/static/partial/login.html rename to brewman/static/app/login/login.html diff --git a/brewman/static/scripts/net-transactions.js b/brewman/static/app/net-transactions/net-transactions.controller.js similarity index 100% rename from brewman/static/scripts/net-transactions.js rename to brewman/static/app/net-transactions/net-transactions.controller.js diff --git a/brewman/static/partial/net-transactions.html b/brewman/static/app/net-transactions/net-transactions.html similarity index 100% rename from brewman/static/partial/net-transactions.html rename to brewman/static/app/net-transactions/net-transactions.html diff --git a/brewman/static/scripts/overlord.js b/brewman/static/app/overlord.app.js similarity index 73% rename from brewman/static/scripts/overlord.js rename to brewman/static/app/overlord.app.js index 6684bf9a..8898eabb 100644 --- a/brewman/static/scripts/overlord.js +++ b/brewman/static/app/overlord.app.js @@ -3,402 +3,402 @@ var overlord = angular.module('overlord', ['overlord.directive', 'overlord.filter', 'overlord.service', 'ngCookies', 'ngRoute', 'ui.bootstrap', 'chieffancypants.loadingBar', 'ngMaterial']) .config(['$routeProvider', '$locationProvider', function ($routeProvider, $locationProvider) { $routeProvider. - when('/', {templateUrl: '/partial/home.html', controller: HomeController, resolve: HomeController.resolve}). - when('/login', {templateUrl: '/partial/login.html', controller: LoginController}). - when('/logout', {templateUrl: '/partial/home.html', controller: LogoutController}). + when('/', {templateUrl: '/app/home.html', controller: HomeController, resolve: HomeController.resolve}). + when('/login', {templateUrl: '/app/login/login.html', controller: LoginController}). + when('/logout', {templateUrl: '/app/home.html', controller: LogoutController}). when('/Journal', { - templateUrl: '/partial/journal.html', + templateUrl: '/app/journal/journal.html', controller: JournalController, resolve: JournalController.resolve }). when('/Journal/:id', { - templateUrl: '/partial/journal.html', + templateUrl: '/app/journal/journal.html', controller: JournalController, resolve: JournalController.resolve }). when('/Payment', { - templateUrl: '/partial/payment.html', + templateUrl: '/app/payment/payment.html', controller: PaymentController, resolve: PaymentController.resolve, reloadOnSearch: false }). when('/Payment/:id', { - templateUrl: '/partial/payment.html', + templateUrl: '/app/payment/payment.html', controller: PaymentController, resolve: PaymentController.resolve, reloadOnSearch: false }). when('/Receipt', { - templateUrl: '/partial/receipt.html', + templateUrl: '/app/receipt/receipt.html', controller: ReceiptController, resolve: ReceiptController.resolve, reloadOnSearch: false }). when('/Receipt/:id', { - templateUrl: '/partial/receipt.html', + templateUrl: '/app/receipt/receipt.html', controller: ReceiptController, resolve: ReceiptController.resolve, reloadOnSearch: false }). when('/Purchase', { - templateUrl: '/partial/purchase.html', + templateUrl: '/app/purchase/purchase.html', controller: PurchaseController, resolve: PurchaseController.resolve }). when('/Purchase/:id', { - templateUrl: '/partial/purchase.html', + templateUrl: '/app/purchase/purchase.html', controller: PurchaseController, resolve: PurchaseController.resolve }). when('/Return', { - templateUrl: '/partial/purchase-return.html', + templateUrl: '/app/purchase-return/purchase-return.html', controller: PurchaseReturnController, resolve: PurchaseReturnController.resolve }). when('/Return/:id', { - templateUrl: '/partial/purchase-return.html', + templateUrl: '/app/purchase-return/purchase-return.html', controller: PurchaseReturnController, resolve: PurchaseReturnController.resolve }). when('/Issue', { - templateUrl: '/partial/issue.html', + templateUrl: '/app/issue/issue.html', controller: IssueController, resolve: IssueController.resolve }). when('/Issue/:id', { - templateUrl: '/partial/issue.html', + templateUrl: '/app/issue/issue.html', controller: IssueController, resolve: IssueController.resolve }). when('/SalaryDeduction', { - templateUrl: '/partial/salary-deduction.html', + templateUrl: '/app/salary-deduction/salary-deduction.html', controller: SalaryDeductionController, resolve: SalaryDeductionController.resolve }). when('/SalaryDeduction/:id', { - templateUrl: '/partial/salary-deduction.html', + templateUrl: '/app/salary-deduction/salary-deduction.html', controller: SalaryDeductionController, resolve: SalaryDeductionController.resolve }). when('/ServiceCharge', { - templateUrl: '/partial/employee-service-charge.html', + templateUrl: '/app/employee/employee-service-charge.html', controller: ServiceChargeController, resolve: ServiceChargeController.resolve }). when('/ServiceCharge/:id', { - templateUrl: '/partial/employee-service-charge.html', + templateUrl: '/app/employee/employee-service-charge.html', controller: ServiceChargeController, resolve: ServiceChargeController.resolve }). when('/Ledger', { - templateUrl: '/partial/ledger.html', + templateUrl: '/app/ledger/ledger.html', controller: LedgerController, resolve: LedgerController.resolve }). when('/Ledger/:id', { - templateUrl: '/partial/ledger.html', + templateUrl: '/app/ledger/ledger.html', controller: LedgerController, resolve: LedgerController.resolve }). when('/Reconcile', { - templateUrl: '/partial/reconcile.html', + templateUrl: '/app/reconcile/reconcile.html', controller: ReconcileController, resolve: ReconcileController.resolve }). when('/Reconcile/:id', { - templateUrl: '/partial/reconcile.html', + templateUrl: '/app/reconcile/reconcile.html', controller: ReconcileController, resolve: ReconcileController.resolve }). when('/ProductLedger', { - templateUrl: '/partial/product-ledger.html', + templateUrl: '/app/product-ledger/product-ledger.html', controller: ProductLedgerController, resolve: ProductLedgerController.resolve }). when('/ProductLedger/:id', { - templateUrl: '/partial/product-ledger.html', + templateUrl: '/app/product-ledger/product-ledger.html', controller: ProductLedgerController, resolve: ProductLedgerController.resolve }). when('/CashFlow', { - templateUrl: '/partial/cash-flow.html', + templateUrl: '/app/cash-flow/cash-flow.html', controller: CashFlowController, resolve: CashFlowController.resolve }). when('/CashFlow/:id', { - templateUrl: '/partial/cash-flow.html', + templateUrl: '/app/cash-flow/cash-flow.html', controller: CashFlowController, resolve: CashFlowController.resolve }). when('/RawMaterialCost', { - templateUrl: '/partial/raw-material-cost.html', + templateUrl: '/app/raw-material-cost/raw-material-cost.html', controller: RawMaterialCostController, resolve: RawMaterialCostController.resolve }). when('/RawMaterialCost/:id', { - templateUrl: '/partial/raw-material-cost-detail.html', + templateUrl: '/app/raw-material-cost/raw-material-cost-detail.html', controller: RawMaterialCostController, resolve: RawMaterialCostController.resolve }). when('/Attendance', { - templateUrl: '/partial/attendance.html', + templateUrl: '/app/attendance/attendance.html', controller: AttendanceController, resolve: AttendanceController.resolve }). when('/Attendance/:date', { - templateUrl: '/partial/attendance.html', + templateUrl: '/app/attendance/attendance.html', controller: AttendanceController, resolve: AttendanceController.resolve }). when('/EmployeeAttendance', { - templateUrl: '/partial/employee-attendance.html', + templateUrl: '/app/employee/employee-attendance.html', controller: EmployeeAttendanceController, resolve: EmployeeAttendanceController.resolve }). when('/EmployeeAttendance/:id', { - templateUrl: '/partial/employee-attendance.html', + templateUrl: '/app/employee/employee-attendance.html', controller: EmployeeAttendanceController, resolve: EmployeeAttendanceController.resolve }). when('/Daybook', { - templateUrl: '/partial/daybook.html', + templateUrl: '/app/daybook/daybook.html', controller: DaybookController, resolve: DaybookController.resolve }). when('/Unposted', { - templateUrl: '/partial/unposted.html', + templateUrl: '/app/unposted/unposted.html', controller: UnpostedController, resolve: UnpostedController.resolve }). when('/ProfitLoss', { - templateUrl: '/partial/profit-loss.html', + templateUrl: '/app/profit-loss/profit-loss.html', controller: ProfitLossController, resolve: ProfitLossController.resolve }). when('/StockMovement', { - templateUrl: '/partial/stock-movement.html', + templateUrl: '/app/stock-movement/stock-movement.html', controller: StockMovementController, resolve: StockMovementController.resolve }). when('/NetTransactions', { - templateUrl: '/partial/net-transactions.html', + templateUrl: '/app/net-transactions/net-transactions.html', controller: NetTransactionsController, resolve: NetTransactionsController.resolve }). when('/PurchaseEntries', { - templateUrl: '/partial/purchase-entries.html', + templateUrl: '/app/purchase-entries/purchase-entries.html', controller: PurchaseEntriesController, resolve: PurchaseEntriesController.resolve }). when('/Purchases', { - templateUrl: '/partial/purchases.html', + templateUrl: '/app/purchases/purchases.html', controller: PurchasesController, resolve: PurchasesController.resolve }). when('/EmployeeFunctions', { - templateUrl: '/partial/employee-functions.html', + templateUrl: '/app/employee-functions/employee-functions.html', controller: EmployeeFunctionsController }). when('/BalanceSheet', { - templateUrl: '/partial/balance-sheet.html', + templateUrl: '/app/balance-sheet/balance-sheet.html', controller: BalanceSheetController, resolve: BalanceSheetController.resolve }). when('/BalanceSheet/:date', { - templateUrl: '/partial/balance-sheet.html', + templateUrl: '/app/balance-sheet/balance-sheet.html', controller: BalanceSheetController, resolve: BalanceSheetController.resolve }). when('/TrialBalance', { - templateUrl: '/partial/trial-balance.html', + templateUrl: '/app/trial-balance/trial-balance.html', controller: TrialBalanceController, resolve: TrialBalanceController.resolve }). when('/TrialBalance/:date', { - templateUrl: '/partial/trial-balance.html', + templateUrl: '/app/trial-balance/trial-balance.html', controller: TrialBalanceController, resolve: TrialBalanceController.resolve }). when('/ClosingStock', { - templateUrl: '/partial/closing-stock.html', + templateUrl: '/app/closing-stock/closing-stock.html', controller: ClosingStockController, resolve: ClosingStockController.resolve }). when('/ClosingStock/:date', { - templateUrl: '/partial/closing-stock.html', + templateUrl: '/app/closing-stock/closing-stock.html', controller: ClosingStockController, resolve: ClosingStockController.resolve }). when('/Accounts', { - templateUrl: '/partial/account-list.html', + templateUrl: '/app/account/account-list.html', controller: AccountListController, resolve: AccountListController.resolve, reloadOnSearch: false }). when('/Account', { - templateUrl: '/partial/account-detail.html', + templateUrl: '/app/account/account-detail.html', controller: AccountController, resolve: AccountController.resolve }). when('/Account/:id', { - templateUrl: '/partial/account-detail.html', + templateUrl: '/app/account-detail/account-detail.html', controller: AccountController, resolve: AccountController.resolve }). when('/Employees', { - templateUrl: '/partial/employee-list.html', + templateUrl: '/app/employee/employee-list.html', controller: EmployeeListController, resolve: EmployeeListController.resolve, reloadOnSearch: false }). when('/Employee', { - templateUrl: '/partial/employee-detail.html', + templateUrl: '/app/employee/employee-detail.html', controller: EmployeeController, resolve: EmployeeController.resolve }). when('/Employee/:id', { - templateUrl: '/partial/employee-detail.html', + templateUrl: '/app/employee/employee-detail.html', controller: EmployeeController, resolve: EmployeeController.resolve }). when('/CostCentres', { - templateUrl: '/partial/cost-centre-list.html', + templateUrl: '/app/cost-centre/cost-centre-list.html', controller: CostCentreListController, resolve: CostCentreListController.resolve }). when('/CostCentre', { - templateUrl: '/partial/cost-centre-detail.html', + templateUrl: '/app/cost-centre/cost-centre-detail.html', controller: CostCentreController, resolve: CostCentreController.resolve }). when('/CostCentre/:id', { - templateUrl: '/partial/cost-centre-detail.html', + templateUrl: '/app/cost-centre/cost-centre-detail.html', controller: CostCentreController, resolve: CostCentreController.resolve }). when('/Products', { - templateUrl: '/partial/product-list.html', + templateUrl: '/app/product/product-list.html', controller: ProductListController, resolve: ProductListController.resolve, reloadOnSearch: false }). when('/Product', { - templateUrl: '/partial/product-detail.html', + templateUrl: '/app/product/product-detail.html', controller: ProductController, resolve: ProductController.resolve }). when('/Product/:id', { - templateUrl: '/partial/product-detail.html', + templateUrl: '/app/product/product-detail.html', controller: ProductController, resolve: ProductController.resolve }). when('/Recipes', { - templateUrl: '/partial/recipe-list.html', + templateUrl: '/app/recipe/recipe-list.html', controller: RecipeListController, resolve: RecipeListController.resolve, reloadOnSearch: false }). when('/Recipe', { - templateUrl: '/partial/recipe-detail.html', + templateUrl: '/app/recipe/recipe-detail.html', controller: RecipeController, resolve: RecipeController.resolve }). when('/Recipe/:id', { - templateUrl: '/partial/recipe-detail.html', + templateUrl: '/app/recipe/recipe-detail.html', controller: RecipeController, resolve: RecipeController.resolve }). when('/ProductGroups', { - templateUrl: '/partial/product-group-list.html', + templateUrl: '/app/product-group/product-group-list.html', controller: ProductGroupListController, resolve: ProductGroupListController.resolve }). when('/ProductGroup', { - templateUrl: '/partial/product-group-detail.html', + templateUrl: '/app/product-group/product-group-detail.html', controller: ProductGroupController, resolve: ProductGroupController.resolve }). when('/ProductGroup/:id', { - templateUrl: '/partial/product-group-detail.html', + templateUrl: '/app/product-group/product-group-detail.html', controller: ProductGroupController, resolve: ProductGroupController.resolve }). when('/Users', { - templateUrl: '/partial/user-list.html', + templateUrl: '/app/user/user-list.html', controller: UserListController, resolve: UserListController.resolve }). when('/User', { - templateUrl: '/partial/user-detail.html', + templateUrl: '/app/user/user-detail.html', controller: UserController, resolve: UserController.resolve }). when('/User/:id', { - templateUrl: '/partial/user-detail.html', + templateUrl: '/app/user/user-detail.html', controller: UserController, resolve: UserController.resolve }). when('/Groups', { - templateUrl: '/partial/group-list.html', + templateUrl: '/app/group/group-list.html', controller: GroupListController, resolve: GroupListController.resolve }). when('/Group', { - templateUrl: '/partial/group-detail.html', controller: GroupController, + templateUrl: '/app/group/group-detail.html', resolve: GroupController.resolve }). when('/Group/:id', { - templateUrl: '/partial/group-detail.html', + templateUrl: '/app/group/group-detail.html', controller: GroupController, resolve: GroupController.resolve }). when('/Clients', { - templateUrl: '/partial/client-list.html', + templateUrl: '/app/client/client-list.html', controller: ClientListController, resolve: ClientListController.resolve }). when('/Client/:id', { - templateUrl: '/partial/client-detail.html', + templateUrl: '/app/client/client-detail.html', controller: ClientController, resolve: ClientController.resolve }). when('/Settings', { - templateUrl: '/partial/settings.html', + templateUrl: '/app/settings/settings.html', controller: SettingsController, resolve: SettingsController.resolve }). - otherwise({templateUrl: '/partial/404.html'}); + otherwise({templateUrl: '/app/404.html'}); $locationProvider.html5Mode(true).hashPrefix('!'); }]) .config(['$httpProvider', function ($httpProvider) { diff --git a/brewman/static/partial/payment-modal.html b/brewman/static/app/payment/payment-modal.html similarity index 100% rename from brewman/static/partial/payment-modal.html rename to brewman/static/app/payment/payment-modal.html diff --git a/brewman/static/scripts/payment.js b/brewman/static/app/payment/payment.controller.js similarity index 99% rename from brewman/static/scripts/payment.js rename to brewman/static/app/payment/payment.controller.js index 1299ac1a..09b16727 100644 --- a/brewman/static/scripts/payment.js +++ b/brewman/static/app/payment/payment.controller.js @@ -144,7 +144,7 @@ var PaymentController = ['$scope', '$location', 'asDateFilter', '$uibModal', 'up var modalInstance = $modal.open({ backdrop: true, size: 'lg', - templateUrl: '/partial/payment-modal.html', + templateUrl: '/app/payment/payment-modal.html', controller: PaymentModalController, resolve: { edit: function () { diff --git a/brewman/static/partial/payment.html b/brewman/static/app/payment/payment.html similarity index 100% rename from brewman/static/partial/payment.html rename to brewman/static/app/payment/payment.html diff --git a/brewman/static/partial/product-group-detail.html b/brewman/static/app/product-group/product-group-detail.html similarity index 100% rename from brewman/static/partial/product-group-detail.html rename to brewman/static/app/product-group/product-group-detail.html diff --git a/brewman/static/partial/product-group-list.html b/brewman/static/app/product-group/product-group-list.html similarity index 100% rename from brewman/static/partial/product-group-list.html rename to brewman/static/app/product-group/product-group-list.html diff --git a/brewman/static/scripts/product-group.js b/brewman/static/app/product-group/product-group.controller.js similarity index 100% rename from brewman/static/scripts/product-group.js rename to brewman/static/app/product-group/product-group.controller.js diff --git a/brewman/static/scripts/product-ledger.js b/brewman/static/app/product-ledger/product-ledger.controller.js similarity index 100% rename from brewman/static/scripts/product-ledger.js rename to brewman/static/app/product-ledger/product-ledger.controller.js diff --git a/brewman/static/partial/product-ledger.html b/brewman/static/app/product-ledger/product-ledger.html similarity index 100% rename from brewman/static/partial/product-ledger.html rename to brewman/static/app/product-ledger/product-ledger.html diff --git a/brewman/static/partial/product-detail.html b/brewman/static/app/product/product-detail.html similarity index 100% rename from brewman/static/partial/product-detail.html rename to brewman/static/app/product/product-detail.html diff --git a/brewman/static/partial/product-list.html b/brewman/static/app/product/product-list.html similarity index 100% rename from brewman/static/partial/product-list.html rename to brewman/static/app/product/product-list.html diff --git a/brewman/static/scripts/product.js b/brewman/static/app/product/product.controller.js similarity index 100% rename from brewman/static/scripts/product.js rename to brewman/static/app/product/product.controller.js diff --git a/brewman/static/scripts/profit-loss.js b/brewman/static/app/profit-loss/profit-loss.controller.js similarity index 100% rename from brewman/static/scripts/profit-loss.js rename to brewman/static/app/profit-loss/profit-loss.controller.js diff --git a/brewman/static/partial/profit-loss.html b/brewman/static/app/profit-loss/profit-loss.html similarity index 100% rename from brewman/static/partial/profit-loss.html rename to brewman/static/app/profit-loss/profit-loss.html diff --git a/brewman/static/scripts/purchase-entries.js b/brewman/static/app/purchase-entries/purchase-entries.controller.js similarity index 100% rename from brewman/static/scripts/purchase-entries.js rename to brewman/static/app/purchase-entries/purchase-entries.controller.js diff --git a/brewman/static/partial/purchase-entries.html b/brewman/static/app/purchase-entries/purchase-entries.html similarity index 100% rename from brewman/static/partial/purchase-entries.html rename to brewman/static/app/purchase-entries/purchase-entries.html diff --git a/brewman/static/partial/purchase-return-modal.html b/brewman/static/app/purchase-return/purchase-return-modal.html similarity index 100% rename from brewman/static/partial/purchase-return-modal.html rename to brewman/static/app/purchase-return/purchase-return-modal.html diff --git a/brewman/static/scripts/purchase-return.js b/brewman/static/app/purchase-return/purchase-return.controller.js similarity index 99% rename from brewman/static/scripts/purchase-return.js rename to brewman/static/app/purchase-return/purchase-return.controller.js index ac262586..f21cac71 100644 --- a/brewman/static/scripts/purchase-return.js +++ b/brewman/static/app/purchase-return/purchase-return.controller.js @@ -135,7 +135,7 @@ var PurchaseReturnController = ['$scope', '$location', 'asDateFilter', '$uibModa var modalInstance = $modal.open({ backdrop: true, size: 'lg', - templateUrl: '/partial/purchase-return-modal.html', + templateUrl: '/app/purchase-return/purchase-return-modal.html', controller: PurchaseReturnModalController, resolve: { edit: function () { diff --git a/brewman/static/partial/purchase-return.html b/brewman/static/app/purchase-return/purchase-return.html similarity index 100% rename from brewman/static/partial/purchase-return.html rename to brewman/static/app/purchase-return/purchase-return.html diff --git a/brewman/static/partial/purchase-modal.html b/brewman/static/app/purchase/purchase-modal.html similarity index 100% rename from brewman/static/partial/purchase-modal.html rename to brewman/static/app/purchase/purchase-modal.html diff --git a/brewman/static/scripts/purchase.js b/brewman/static/app/purchase/purchase.controller.js similarity index 99% rename from brewman/static/scripts/purchase.js rename to brewman/static/app/purchase/purchase.controller.js index 3d3fa46e..a209f2cc 100644 --- a/brewman/static/scripts/purchase.js +++ b/brewman/static/app/purchase/purchase.controller.js @@ -137,7 +137,7 @@ var PurchaseController = ['$scope', '$location', 'asDateFilter', '$uibModal', 'u var modalInstance = $modal.open({ backdrop: true, size: 'lg', - templateUrl: '/partial/purchase-modal.html', + templateUrl: '/app/purchase/purchase-modal.html', controller: PurchaseModalController, resolve: { edit: function () { diff --git a/brewman/static/partial/purchase.html b/brewman/static/app/purchase/purchase.html similarity index 100% rename from brewman/static/partial/purchase.html rename to brewman/static/app/purchase/purchase.html diff --git a/brewman/static/scripts/purchases.js b/brewman/static/app/purchases/purchases.controller.js similarity index 100% rename from brewman/static/scripts/purchases.js rename to brewman/static/app/purchases/purchases.controller.js diff --git a/brewman/static/partial/purchases.html b/brewman/static/app/purchases/purchases.html similarity index 100% rename from brewman/static/partial/purchases.html rename to brewman/static/app/purchases/purchases.html diff --git a/brewman/static/partial/raw-material-cost-detail.html b/brewman/static/app/raw-material-cost/raw-material-cost-detail.html similarity index 100% rename from brewman/static/partial/raw-material-cost-detail.html rename to brewman/static/app/raw-material-cost/raw-material-cost-detail.html diff --git a/brewman/static/scripts/raw-material-cost.js b/brewman/static/app/raw-material-cost/raw-material-cost.controller.js similarity index 100% rename from brewman/static/scripts/raw-material-cost.js rename to brewman/static/app/raw-material-cost/raw-material-cost.controller.js diff --git a/brewman/static/partial/raw-material-cost.html b/brewman/static/app/raw-material-cost/raw-material-cost.html similarity index 100% rename from brewman/static/partial/raw-material-cost.html rename to brewman/static/app/raw-material-cost/raw-material-cost.html diff --git a/brewman/static/partial/receipt-modal.html b/brewman/static/app/receipt/receipt-modal.html similarity index 100% rename from brewman/static/partial/receipt-modal.html rename to brewman/static/app/receipt/receipt-modal.html diff --git a/brewman/static/scripts/receipt.js b/brewman/static/app/receipt/receipt.controller.js similarity index 99% rename from brewman/static/scripts/receipt.js rename to brewman/static/app/receipt/receipt.controller.js index b4999d72..218bf4e2 100644 --- a/brewman/static/scripts/receipt.js +++ b/brewman/static/app/receipt/receipt.controller.js @@ -143,7 +143,7 @@ var ReceiptController = ['$scope', '$routeParams', '$location', 'asDateFilter', var modalInstance = $modal.open({ backdrop: true, size: 'lg', - templateUrl: '/partial/receipt-modal.html', + templateUrl: '/app/receipt/receipt-modal.html', controller: ReceiptModalController, resolve: { edit: function () { diff --git a/brewman/static/partial/receipt.html b/brewman/static/app/receipt/receipt.html similarity index 100% rename from brewman/static/partial/receipt.html rename to brewman/static/app/receipt/receipt.html diff --git a/brewman/static/partial/recipe-detail.html b/brewman/static/app/recipe/recipe-detail.html similarity index 100% rename from brewman/static/partial/recipe-detail.html rename to brewman/static/app/recipe/recipe-detail.html diff --git a/brewman/static/partial/recipe-list.html b/brewman/static/app/recipe/recipe-list.html similarity index 100% rename from brewman/static/partial/recipe-list.html rename to brewman/static/app/recipe/recipe-list.html diff --git a/brewman/static/scripts/recipe.js b/brewman/static/app/recipe/recipe.controller.js similarity index 100% rename from brewman/static/scripts/recipe.js rename to brewman/static/app/recipe/recipe.controller.js diff --git a/brewman/static/scripts/reconcile.js b/brewman/static/app/reconcile/reconcile.controller.js similarity index 100% rename from brewman/static/scripts/reconcile.js rename to brewman/static/app/reconcile/reconcile.controller.js diff --git a/brewman/static/partial/reconcile.html b/brewman/static/app/reconcile/reconcile.html similarity index 100% rename from brewman/static/partial/reconcile.html rename to brewman/static/app/reconcile/reconcile.html diff --git a/brewman/static/scripts/salary-deduction.js b/brewman/static/app/salary-deduction/salary-deduction.controller.js similarity index 100% rename from brewman/static/scripts/salary-deduction.js rename to brewman/static/app/salary-deduction/salary-deduction.controller.js diff --git a/brewman/static/partial/salary-deduction.html b/brewman/static/app/salary-deduction/salary-deduction.html similarity index 100% rename from brewman/static/partial/salary-deduction.html rename to brewman/static/app/salary-deduction/salary-deduction.html diff --git a/brewman/static/scripts/service-charge.js b/brewman/static/app/service-charge/service-charge.controller.js similarity index 100% rename from brewman/static/scripts/service-charge.js rename to brewman/static/app/service-charge/service-charge.controller.js diff --git a/brewman/static/scripts/settings.js b/brewman/static/app/settings/settings.controller.js similarity index 100% rename from brewman/static/scripts/settings.js rename to brewman/static/app/settings/settings.controller.js diff --git a/brewman/static/partial/settings.html b/brewman/static/app/settings/settings.html similarity index 100% rename from brewman/static/partial/settings.html rename to brewman/static/app/settings/settings.html diff --git a/brewman/static/scripts/stock-movement.js b/brewman/static/app/stock-movement/stock-movement.controller.js similarity index 100% rename from brewman/static/scripts/stock-movement.js rename to brewman/static/app/stock-movement/stock-movement.controller.js diff --git a/brewman/static/partial/stock-movement.html b/brewman/static/app/stock-movement/stock-movement.html similarity index 100% rename from brewman/static/partial/stock-movement.html rename to brewman/static/app/stock-movement/stock-movement.html diff --git a/brewman/static/scripts/trial-balance.js b/brewman/static/app/trial-balance/trial-balance.controller.js similarity index 100% rename from brewman/static/scripts/trial-balance.js rename to brewman/static/app/trial-balance/trial-balance.controller.js diff --git a/brewman/static/partial/trial-balance.html b/brewman/static/app/trial-balance/trial-balance.html similarity index 100% rename from brewman/static/partial/trial-balance.html rename to brewman/static/app/trial-balance/trial-balance.html diff --git a/brewman/static/scripts/unposted.js b/brewman/static/app/unposted/unposted.controller.js similarity index 100% rename from brewman/static/scripts/unposted.js rename to brewman/static/app/unposted/unposted.controller.js diff --git a/brewman/static/partial/unposted.html b/brewman/static/app/unposted/unposted.html similarity index 100% rename from brewman/static/partial/unposted.html rename to brewman/static/app/unposted/unposted.html diff --git a/brewman/static/partial/user-detail.html b/brewman/static/app/user/user-detail.html similarity index 100% rename from brewman/static/partial/user-detail.html rename to brewman/static/app/user/user-detail.html diff --git a/brewman/static/partial/user-list.html b/brewman/static/app/user/user-list.html similarity index 100% rename from brewman/static/partial/user-list.html rename to brewman/static/app/user/user-list.html diff --git a/brewman/static/scripts/user.js b/brewman/static/app/user/user.controller.js similarity index 100% rename from brewman/static/scripts/user.js rename to brewman/static/app/user/user.controller.js diff --git a/brewman/static/base.html b/brewman/static/base.html index 4d19fd3f..d9c4e26b 100644 --- a/brewman/static/base.html +++ b/brewman/static/base.html @@ -9,9 +9,11 @@ - + - + @@ -29,7 +31,9 @@ - + @@ -46,52 +50,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - -