From 9a60105ed348fb160af7e1c3cd7e1c28db4624c8 Mon Sep 17 00:00:00 2001 From: arsalan Date: Wed, 21 Feb 2024 17:22:45 +0530 Subject: [PATCH] add vendor module --- .gitignore | 9 +- excel/Pos.xls | Bin 0 -> 5120 bytes excel/Products.xls | Bin 0 -> 5120 bytes excel/Quotes.xls | Bin 0 -> 14848 bytes excel/VendorList.xls | Bin 0 -> 7168 bytes src/main/kotlin/com/restapi/Main.kt | 3 + .../com/restapi/controllers/Entities.kt | 65 +++- .../kotlin/com/restapi/controllers/Excel.kt | 277 ++++++++++++------ .../kotlin/com/restapi/controllers/Filters.kt | 24 +- src/main/kotlin/com/restapi/domain/models.kt | 41 ++- 10 files changed, 299 insertions(+), 120 deletions(-) create mode 100644 excel/Pos.xls create mode 100644 excel/Products.xls create mode 100644 excel/Quotes.xls create mode 100644 excel/VendorList.xls diff --git a/.gitignore b/.gitignore index 64eadf0..acb5b73 100644 --- a/.gitignore +++ b/.gitignore @@ -43,4 +43,11 @@ bin/ application.yaml initial-data.sql app.yaml -*.env.json \ No newline at end of file +*.env.json + +### API Logs ### +api.log +api.2024* + +### Excel FIles ### +./excel \ No newline at end of file diff --git a/excel/Pos.xls b/excel/Pos.xls new file mode 100644 index 0000000000000000000000000000000000000000..63ee1540bb8d9f64d4d4914bfb8270b81a2d95a9 GIT binary patch literal 5120 zcmeHKOKcle6utBDFKH6zLkoeXgWW*lxNTZMR752(T!$|!aiK_y;Gb>h0fTGX0ypn{EpZC@*j%8ELHKV zkwH^bL2c7Tp2|O64pK;QKR2*G_VA#gZM{<(Jc-e5x>Y69Y4ZJ?5Gm9}oC|3OBoCBP>?lF4I)H1;cYZhpkyD`j|HQbxf34E8kU$v==}9vF*B`G%XE z^ai{a2g3>9fNpPhOsA_D*6X(^jw+(xnh3{sSvMHx*%$b)Zo}R<&tyCM-Ej8W&i-b` z6<&7R#f|5fjKlA4gNu*uf~R-EQ@h}?wm2s^g3s$naP%ndymjM}s#Cn7HM#C>ghk!g z&_&(fh=`gRBp9D|DvOpeQ?J&{TCrL&q&;roC#*`L zY8&UwvW0ut(XxetZLO@}qR!dXLVdAjJW{}I?J8`Hw)sl2X5{SRq7@~YshgErv33z= za~Py#WXsihrG`6v&a%rZhFK{X4_7ONA`ia;hPmkz<0z+aFmR?|mCGh#dDbc|74eOy zVX<5_7Hvy@k86Dr{%7W==cZ)mQ!u>;a(@#CT9oSW00a6Nbp!PjBJ%@k&N$@F6sOO- zu0}SXbEG>}&M{=+iRAJ;g3=|<^8WSCum*nN!Q} zjH;Y7@w@X!Md=~N*hMSG2S_W%Sz0T`jQ!Yk5j~lS5lKzK<-%h~O@+qZrKUk+zf#ko zu}7)#rNnWTS{NG7g480=kQF#u6dK1-w#A@fK{#3mG@en})(MTXN!FNC57;CBM65WX zoL3^2$)7S3QGJN)p#kA6RBAdjj zTqI*oM@obj^85$qAUFMH%Q7v!!2^AOpCxpSs0H9vP1arU^Yh;xs)q@<;vJFhJ1 z7mfr|6|r`axPv&{8!udXG%I~DcQ`7jk|_5 z;>BI_xPS1rV5)iC2Ui`WmAi)Z;&JEI>2c?S){8RFgua8j9^kGAxa$G#y5P?LVK`=b zfV=K-UwT6@)jjU-HXNjtyS~l+JFL?!1U^R}(wg`^sP@sPyrC$=52qZ)_wf9nI46tP NJiDa(((tc8{{R@$%31&b literal 0 HcmV?d00001 diff --git a/excel/Products.xls b/excel/Products.xls new file mode 100644 index 0000000000000000000000000000000000000000..118f9e0367a506a984efd133d874637a7808e1c9 GIT binary patch literal 5120 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 literal 0 HcmV?d00001 diff --git a/excel/VendorList.xls b/excel/VendorList.xls new file mode 100644 index 0000000000000000000000000000000000000000..98fc001d364307c6d92769071d28720724bb90b3 GIT binary patch literal 7168 zcmeI0O>7&-8HPVn)W7AWWhZIe#Mw%5BFU0N>R)jkla^$Mjwmq{8>fy_WhJg8#uRCg z6l3Sms%Z-}Km)YsrH5X8?4>^_&>k8TG1^0b258Y93iM?6+(Z9S6iLJNwRj-^?@L%+BoUSHC=R=hhF7-<3Vb8EKJ!?RH9AAU_nim#Cn8cb8dy%5r3V zeEbhZAS-43YGTX0l#o{BW^j~0^!`C<4f)+|njiP^^ydprE~E8|T$5GBaqT`{2N(59 z*tAcMgRPo#!;p6#XwLh8RUC^CaJC=-5uB|!`OLTD?7-QHvkPZ8&OO@ ztf=tRBmbzneovLYtu3WjHbaL)SD*fA|1>N_Lh@obq3qsL*FJSUjB7}KtbBf_a^muU zybJr?FMQow##$v=DLBRdNWt60$KkbcB61wJSdsc3@9Q7#?~knvo*D4(2Tw#E!>}B0 zDt#&I=3fq)*chQtHcU>(n(BZ=H7D^z+k0)AYtn`jG9)pP6*e$r`$V1`PZ^YBNyy?2N*w?UyhVc7tNTrd7@W6SiiM%g=h`b5gS8!sp zT`ZqQ(~HiQizL0Ao<~I&mvi>w_SULf!D^e#=PPctiuE|_)C#2yY`(MQQq5Vb+4SmZ z$oVa&P(0kw>GEo!=%U?tW6?$<@zJqy)P_cIhi(15Q`&Hf<%)}KeofaL$1d-zt|iuP zzJ7YGyag4b*Tm%1^h^vDj-r}Z%bO+DW!8ieRG9{|Q-Jl2o3AI}PhVJ%!P?#0a&)7p z0->LCi<^Z;gQIZDyX%SV`fHxkIGmiKdqX>+ar9w!(=C;pfZG_{HZ}{1O10*>O(4hH zpH}MIE}U=$`zSiPQLSmgs&q#!)8zz;ygDYqRd-AIawQ%|^IO#|w;l&G{o@!O1Zj=o zug4K=FJg&$-1DA7kEdZ>FO-~{tcfWIFmCD=wU7tnrljpvK+8nk57`Xb-Eg*R&K9}V zjjlr9>pHMuYw6cv$6-A-IgwB-Sa{+w5a!Ey=NdNbs#D5W9Pq=!`=d!5fv&mL8s;LJ z00sq55Hd;d!oDH0v6-ovsj2DF$yki8qazse)NFQXdFevVo?Xgjma@rQYH86PNG;B# zl7n_8n|dLco3|HI=~Qlh4&jbXC6me7^u)yU$Y zIUpld$`>3vQ?JFZ?93QK#jd7Gb*EU!U#!*;s)7;lch;-GFKmUdYWMN?s8k<{_hI=NEIZ7*W4WGM7zek_##Oxo4Bvu12bu#9p}kjUrfw>d5qOwJIvL6d5mDt?gKSj^hk+l6~eeNrdoxe7)`BOpcqH3 zB2bK=R(xA$?6hiwV$`&1hhn_6>VRUTsMwMPCSQf17#&>}hGJZ_YJp-zw2DA67A=@5 zA+*f?sw1Jx+mOS!Xw?oy3#~eE&sb2gcb1xGT9E)tqgO@(tTUb>0cW{3GL7!1U z0?r&u`n|GNMew*$Bsggl37#;D1XLtw4G`#Fw<>}sjWr1dj0zHPwp#dD(|&D=V8|#E zoHB|8!$y&SiUe%|0v&@kMKEHlNpRYzAOW8ci{EZ)yxJ9kKS$b|=0Up}g+>_(s7TNr zAnRIq> ziK=Jesdv6bV+Kev5Ve&sY!=q0h@3_x(K+?v)>L0avr1 WDUU}{5BF9ae9hp&hx^0+Q~hs>ECw) { get("quotes/{id}", VendorCtrl::getQuotes, Roles(Role.Explicit("ROLE_QUOTE_VIEW", "ROLE_QUOTE_CREATE", "ROLE_VENDOR_VIEW"))) get("pos/{id}", VendorCtrl::getPos, Roles(Role.Explicit("ROLE_PO_VIEW", "ROLE_PO_CREATE`"))) put("/rate/{id}/{rating}", VendorCtrl::rate, Roles(Role.Explicit("ROLE_VENDOR_CREATE"))) + put("/{id}", VendorCtrl::update, Roles(Role.Explicit("ROLE_VENDOR_CREATE"))) } path("/po") { get("/next", PurchaseOrderCtrl::getNextNum, Roles(Role.Explicit("ROLE_PO_CREATE"))) @@ -126,6 +127,7 @@ fun main(args: Array) { post("/batch", PurchaseOrderCtrl::createBatch, Roles(Role.Explicit("ROLE_PO_CREATE"))) post("/getAll", PurchaseOrderCtrl::getAll, Roles(Role.Explicit("ROLE_PO_CREATE", "ROLE_PO_VIEW", "ROLE_VENDOR_CREATE"))) get("/{id}", PurchaseOrderCtrl::get, Roles(Role.Explicit("ROLE_PO_CREATE", "ROLE_PO_VIEW", "ROLE_QUOTE_CREATE"))) + put("/{id}", PurchaseOrderCtrl::update, Roles(Role.Explicit("ROLE_PO_CREATE"))) put("/approve/{id}", PurchaseOrderCtrl::approve, Roles(Role.Explicit())) put("/reject/{id}", PurchaseOrderCtrl::reject, Roles(Role.Explicit())) get("/refQuote/{id}", PurchaseOrderCtrl::quoteReference, Roles(Role.Explicit("ROLE_PO_CREATE"))) @@ -136,6 +138,7 @@ fun main(args: Array) { post("/batch", QuotationCtrl::createBatch, Roles(Role.Explicit("ROLE_QUOTE_CREATE"))) post("/getAll", QuotationCtrl::getAll, Roles(Role.Explicit("ROLE_QUOTE_CREATE", "ROLE_QUOTE_VIEW"))) get("/{id}", QuotationCtrl::get, Roles(Role.Explicit("ROLE_QUOTE_VIEW", "ROLE_QUOTE_CREATE"))) + put("/{id}", QuotationCtrl::update, Roles(Role.Explicit("ROLE_QUOTE_CREATE"))) delete("/{id}", QuotationCtrl::delete, Roles(Role.Explicit("ROLE_QUOTE_CREATE"))) } path("/product") { diff --git a/src/main/kotlin/com/restapi/controllers/Entities.kt b/src/main/kotlin/com/restapi/controllers/Entities.kt index 0e6ddf7..e1262b0 100644 --- a/src/main/kotlin/com/restapi/controllers/Entities.kt +++ b/src/main/kotlin/com/restapi/controllers/Entities.kt @@ -14,6 +14,7 @@ import io.ebean.CallableSql import io.ebean.RawSqlBuilder import io.javalin.http.* import org.slf4j.LoggerFactory +import java.io.FileInputStream import java.sql.Types import java.time.LocalDate import java.time.LocalDateTime @@ -396,7 +397,14 @@ object PurchaseOrderCtrl { fun getAll(ctx: Context) { val filters = ctx.bodyAsClass() val pos = searchPos(filters.common, filters.poFilters) - ctx.json(pos).status(HttpStatus.OK) + val excel = ctx.queryParam("excel") + if(excel != null){ + exportPos(pos) + val inputStream = FileInputStream("./excel/Pos.xls") + ctx.result(inputStream).status(HttpStatus.OK) + }else{ + ctx.json(pos).status(HttpStatus.OK) + } } fun create(ctx: Context) { @@ -450,13 +458,16 @@ object PurchaseOrderCtrl { ?: throw NotFoundResponse("reference quotation not found for po $id") ctx.json(quote) } + fun update(ctx: Context) { - val id = ctx.pathParam("id") + val id = ctx.pathParam("id").toLong() val po = database.find(PurchaseOrder::class.java, id) ?: throw NotFoundResponse("po not found for $id") val updatedPo = ctx.bodyAsClass() po.patchValues(updatedPo) po.update() + ctx.json(po).status(HttpStatus.OK) } + fun delete(ctx: Context) { val id = ctx.pathParam("id") val po = database.find(PurchaseOrder::class.java, id) ?: throw NotFoundResponse("no po found with id $id") @@ -487,8 +498,15 @@ object ProductCtrl { val productList = Session.database.find(Product::class.java) .findList() .sortedBy { it.name } + val excel = ctx.queryParam("excel") + if(excel != null){ + exportProds(productList) + val inputStream = FileInputStream("./excel/Products.xls") + ctx.result(inputStream).status(HttpStatus.OK) - ctx.json(productList) + }else{ + ctx.json(productList) + } } fun create(ctx: Context) { @@ -496,12 +514,14 @@ object ProductCtrl { database.save(product) ctx.json(product).status(HttpStatus.CREATED) } + fun delete(ctx: Context) { val id = ctx.pathParam("id") val prod = database.find(Product::class.java, id) ?: throw NotFoundResponse("no product found with id $id") database.delete(prod) ctx.status(HttpStatus.OK) } + fun patch(ctx: Context) { val id = ctx.pathParam("id") val patchValues = ctx.bodyAsClass>() @@ -520,11 +540,12 @@ object ProductCtrl { } fun update(ctx: Context) { - val id = ctx.pathParam("id") + val id = ctx.pathParam("id").toLong() val product = database.find(Product::class.java, id) ?: throw NotFoundResponse("product not found for $id") val updatedProduct = ctx.bodyAsClass() product.patchValues(updatedProduct) product.update() + ctx.json(product).status(HttpStatus.OK) } @@ -573,8 +594,15 @@ object QuotationCtrl { fun getAll(ctx: Context) { val filters = ctx.bodyAsClass() + val excel: String? = ctx.queryParam("excel") val quotes = searchQuotes(filters.common, filters.quoteFilters) - ctx.json(quotes).status(HttpStatus.OK) + if (excel != null) { + exportQuotations(quotes) + val inputStream = FileInputStream("./excel/Quotes.xls") + ctx.result(inputStream).status(HttpStatus.OK) + } else { + ctx.json(quotes).status(HttpStatus.OK) + } } fun create(ctx: Context) { @@ -599,18 +627,21 @@ object QuotationCtrl { } ctx.result("Quotes batch created").status(HttpStatus.CREATED) } + fun delete(ctx: Context) { val id = ctx.pathParam("id") val quote = database.find(Quotation::class.java, id) ?: throw NotFoundResponse("no quote found with id $id") database.delete(quote) ctx.status(HttpStatus.OK) } + fun update(ctx: Context) { - val id = ctx.pathParam("id") + val id = ctx.pathParam("id").toLong() val quote = database.find(Quotation::class.java, id) ?: throw NotFoundResponse("quote not found for $id") val updatedQuote = ctx.bodyAsClass() quote.patchValues(updatedQuote) quote.update() + ctx.json(quote).status(HttpStatus.OK) } } @@ -632,12 +663,14 @@ object DocumentCtrl { fun print(ctx: Context) { //would be handled in the frontend ?? } + fun delete(ctx: Context) { val id = ctx.pathParam("id") val doc = database.find(Document::class.java, id) ?: throw NotFoundResponse("no document found with id $id") database.delete(doc) ctx.status(HttpStatus.OK) } + fun getWithRefId(ctx: Context) { //fetches a particular doc (po, quote) with ref id val refId = ctx.pathParam("refId") @@ -655,8 +688,8 @@ object DocumentCtrl { object VendorCtrl { val logger = LoggerFactory.getLogger("Vendor") fun get(ctx: Context) { - val id = ctx.pathParam("id") - val vendor =database.find(Vendor::class.java, id) ?: throw NotFoundResponse("no vendor found with id $id") + val id = ctx.pathParam("id").toLong() + val vendor = database.find(Vendor::class.java, id) ?: throw NotFoundResponse("no vendor found with id $id") ctx.status(HttpStatus.OK) ctx.json(vendor) } @@ -666,9 +699,15 @@ object VendorCtrl { fun getAll(ctx: Context) { val filters = ctx.bodyAsClass() logger.info("filters = {}", filters) - val pos = searchVendors(filters.common, filters.vendorFilters) - ctx.status(HttpStatus.OK) - ctx.json(pos) + val excel: String? = ctx.queryParam("excel") + val vendors = searchVendors(filters.common, filters.vendorFilters) + if (excel !== null) { + exportVendors(vendors) + val inputStream = FileInputStream("./excel/VendorList.xls") + ctx.result(inputStream).status(HttpStatus.OK) + } else { + ctx.json(vendors).status(HttpStatus.OK) + } } fun createBatch(ctx: Context) { @@ -684,12 +723,14 @@ object VendorCtrl { } fun update(ctx: Context) { - val id = ctx.pathParam("id") + val id = ctx.pathParam("id").toLong() val vendor = database.find(Vendor::class.java, id) ?: throw NotFoundResponse("vendor not found for $id") val updatedVendor = ctx.bodyAsClass() vendor.patchValues(updatedVendor) vendor.update() + ctx.json(vendor).status(HttpStatus.OK) } + fun delete(ctx: Context) { val id = ctx.pathParam("id") val vendor = database.find(Vendor::class.java, id) ?: throw NotFoundResponse("no vendor found with id $id") diff --git a/src/main/kotlin/com/restapi/controllers/Excel.kt b/src/main/kotlin/com/restapi/controllers/Excel.kt index 833cbd0..292e051 100644 --- a/src/main/kotlin/com/restapi/controllers/Excel.kt +++ b/src/main/kotlin/com/restapi/controllers/Excel.kt @@ -1,4 +1,5 @@ package com.restapi.controllers + import com.google.gson.Gson import com.restapi.domain.* import com.restapi.domain.Document @@ -25,7 +26,7 @@ import java.time.LocalDate import java.time.ZoneId import java.util.* -fun createHeaderRow(cols :List, sh :HSSFSheet, wb: Workbook) { +fun createHeaderRow(cols: List, sh: HSSFSheet, wb: Workbook) { val boldFont = wb.createFont() boldFont.bold = true val style = wb.createCellStyle() @@ -33,13 +34,14 @@ fun createHeaderRow(cols :List, sh :HSSFSheet, wb: Workbook) { style.locked = true sh.createRow(0).apply { - cols.forEachIndexed{index, value -> + cols.forEachIndexed { index, value -> val cell = createCell(index) cell.setCellValue(value) cell.setCellStyle(style) } } } + fun String.parseDate(format: String): Date? { val locale = Locale.getDefault() return try { @@ -48,227 +50,310 @@ fun String.parseDate(format: String): Date? { null } } -fun dateFromCellHelper(cell: Cell): LocalDate?{ - val date = when(cell.cellType){ + +fun dateFromCellHelper(cell: Cell): LocalDate? { + val date = when (cell.cellType) { CellType.STRING -> cell.stringCellValue.parseDate("yyyy-MM-dd") CellType.NUMERIC -> { if (DateUtil.isCellDateFormatted(cell)) { cell.getDateCellValue() - } else{ + } else { null } } + else -> null } return date?.toInstant()?.atZone(ZoneId.systemDefault())?.toLocalDate() } + fun stringFromCellHelper(cell: Cell): String { - val string = when(cell.cellType){ + val string = when (cell.cellType) { CellType.NUMERIC -> cell.numericCellValue.toString() CellType.STRING -> cell.stringCellValue else -> "" } return string } + fun doubleFromCellHelper(cell: Cell): Double { - val double = when(cell.cellType){ + val double = when (cell.cellType) { CellType.NUMERIC -> cell.numericCellValue CellType.STRING -> cell.stringCellValue.toDoubleOrNull() else -> 0.0 } - return double?:0.0 + return double ?: 0.0 } -fun longIntFromCellHelper(cell : Cell) :Long { - val long = when(cell.cellType){ +fun longIntFromCellHelper(cell: Cell): Long { + val long = when (cell.cellType) { CellType.NUMERIC -> cell.numericCellValue.toLong() CellType.STRING -> cell.stringCellValue.toLong() else -> 0 } return long } + enum class FileType { QUOTES, POS, VENDORS, PRODS, DOCS } + enum class EnumFor { UOM, DocType } -fun saveExcelFileLocally(fileName :String, wb: Workbook){ - val out = FileOutputStream(fileName) +fun saveExcelFileLocally(fileName: String, wb: Workbook) { + val path = "./excel/" + val out = FileOutputStream(path + fileName) wb.use { it.write(out) } out.close() } -fun TemplateExcelFile(fileType: FileType){ - when(fileType){ + +fun TemplateExcelFile(fileType: FileType) { + when (fileType) { FileType.QUOTES -> { - val headers : List = listOf("Quotation Number", "Date", "Open Till", "Product Id", "Product Name", "Product Unit Price", "Quantity", "Vendor Name", "Vendor Address", "RFQ Number", "Total Amount", "Terms and Conditions") + val headers: List = listOf( + "Quotation Number", + "Date", + "Open Till", + "Product Id", + "Product Name", + "Product Unit Price", + "Quantity", + "Vendor Name", + "Vendor Address", + "RFQ Number", + "Total Amount", + "Terms and Conditions" + ) val wb = HSSFWorkbook() val sh = wb.createSheet() createHeaderRow(headers, sh, wb) saveExcelFileLocally("Quotes_Template.xls", wb) } + FileType.POS -> { - val headers : List = listOf("Number", "Date", "Open Till", "Reference Quotation Number", "Vendor Name", "Vendor Address", "Product Id", "Product Name", "Unit Price", "Quantity", "Total Amount", "Terms and Conditions") + val headers: List = listOf( + "Number", + "Date", + "Open Till", + "Reference Quotation Number", + "Vendor Name", + "Vendor Address", + "Product Id", + "Product Name", + "Unit Price", + "Quantity", + "Total Amount", + "Terms and Conditions" + ) val wb = HSSFWorkbook() val sh = wb.createSheet() createHeaderRow(headers, sh, wb) saveExcelFileLocally("Purchase_Order_Template.xls", wb) } + FileType.VENDORS -> { - val headers : List = listOf("Name", "MSME", "GST Number", "Address", "Rating", "Contact Name", "Contact Email", "Contact Mobile") + val headers: List = listOf( + "Name", + "MSME", + "GST Number", + "Address", + "Rating", + "Contact Name", + "Contact Email", + "Contact Mobile" + ) val wb = HSSFWorkbook() val sh = wb.createSheet() createHeaderRow(headers, sh, wb) saveExcelFileLocally("Vendors_Template.xls", wb) } + FileType.PRODS -> { - val headers : List = listOf("Id", "Name", "Description", "HSN Code", "UOM") + val headers: List = listOf("Id", "Name", "Description", "HSN Code", "UOM") val wb = HSSFWorkbook() val sh = wb.createSheet() createHeaderRow(headers, sh, wb) val r0 = CellRangeAddressList(0, 1000, 4, 4) - val dv0 = HSSFDataValidation(r0, DVConstraint.createExplicitListConstraint(arrayOf("LTR", "MTR", "NOS", "ALL"))).apply { + val dv0 = HSSFDataValidation( + r0, + DVConstraint.createExplicitListConstraint(arrayOf("LTR", "MTR", "NOS", "ALL")) + ).apply { suppressDropDownArrow = true } sh.addValidationData(dv0) saveExcelFileLocally("Products_Template.xls", wb) } + FileType.DOCS -> { } } } -fun ExportQuotations(quotes :List) { + +fun exportQuotations(quotes: List) { val wb = HSSFWorkbook() val sh = wb.createSheet() - val headers : List = listOf("Quotation Number", "Date", "Open Till", "Product Id", "Product Name", "Product Unit Price", "Quantity", "Vendor Name", "Vendor Address", "RFQ Number", "Total AMount", "Terms and Conditions") + val headers: List = listOf( + "Quotation Number", + "Date", + "Open Till", + "Product Id", + "Product Name", + "Product Unit Price", + "Quantity", + "Vendor Name", + "Vendor Address", + "RFQ Number", + "Total AMount", + "Terms and Conditions" + ) createHeaderRow(headers, sh, wb) - val totalCols = headers.size var rowCnt = 1 - for(quote in quotes){ + for (quote in quotes) { val prodCnt = quote.products.size - for (j in 0..prodCnt - 1){ + for (j in 0..){ +fun exportVendors(vendors: List) { val wb = HSSFWorkbook() val sh = wb.createSheet() - val headers : List = listOf("Name", "MSME", "GST Number", "Address", "Rating", "Contact Name", "Contact Email", "Contact Mobile") + val headers: List = + listOf("No.", "Name", "MSME", "GST Number", "Address", "Rating", "Contact Name", "Contact Email", "Contact Mobile") createHeaderRow(headers, sh, wb) val totalCols = headers.size var rowCnt = 1 - for (vendor in vendors){ + for (vendor in vendors) { val contactCnt = vendor.contacts.size - for (j in 0..contactCnt - 1){ + for (j in 0..){ +fun exportProds(prods: List) { val wb = HSSFWorkbook() val sh = wb.createSheet() - val headers : List = listOf("Id", "Name", "Description", "HSN Code", "UOM") + val headers: List = listOf("Id", "Name", "Description", "HSN Code", "UOM") createHeaderRow(headers, sh, wb) - val totalCols = headers.size var rowCnt = 1 - for (prod in prods){ + for (prod in prods) { val row = sh.createRow(rowCnt++) var i = 0 - row.createCell(i++).setCellValue(prod.id.toString()) - row.createCell(i++).setCellValue(prod.name) - row.createCell(i++).setCellValue(prod.description) - row.createCell(i++).setCellValue(prod.hsnCode) - row.createCell(i++).setCellValue(prod.uom?.name) + row.createCell(i++).setCellValue(prod.id.toString()) + row.createCell(i++).setCellValue(prod.name) + row.createCell(i++).setCellValue(prod.description) + row.createCell(i++).setCellValue(prod.hsnCode) + row.createCell(i++).setCellValue(prod.uom?.name) } + saveExcelFileLocally("Products.xls", wb) } -fun ExportPos(pos :List){ + +fun exportPos(pos: List) { val wb = HSSFWorkbook() val sh = wb.createSheet() - val headers : List = listOf("Number", "Date", "Open Till", "Reference Quotation Number", "Vendor Name", "Vendor Address", "Product Id", "Product Name", "Unit Price", "Quantity", "Total Amount", "Terms and Conditions") + val headers: List = listOf( + "Number", + "Date", + "Open Till", + "Reference Quotation Number", + "Vendor Name", + "Vendor Address", + "Product Id", + "Product Name", + "Unit Price", + "Quantity", + "Total Amount", + "Terms and Conditions" + ) createHeaderRow(headers, sh, wb) - val totalCols = headers.size var rowCnt = 1 - for(po in pos){ + for (po in pos) { val prodCnt = po.products.size - for (j in 0..prodCnt - 1){ + for (j in 0.. { //Quote Number, ProductName, Product Quantity, Total Amount, RFQ Number, Quote Date, Valid Till, TNC[], Documents[] - val quotesMap : MutableMap = mutableMapOf() - val quotesList : List = mutableListOf() + val quotesMap: MutableMap = mutableMapOf() + val quotesList: List = mutableListOf() sh.rowIterator().forEach { row -> - if(row == null){ + if (row == null) { //reached eof return@forEach } @@ -288,7 +373,7 @@ fun ImportFromExcel(fileType: FileType, filePath : String) { if (quotesMap.containsKey(quoteNumber)) { //duplicated row quotesMap.get(quoteNumber)?.products?.add(prod) - }else { + } else { val v = Vendor() v.apply { name = vendorName @@ -309,17 +394,18 @@ fun ImportFromExcel(fileType: FileType, filePath : String) { } } //docs, tncs - // println("$quotesMap") + // println("$quotesMap") // quotesMap.forEach { (k, v) -> // println("$v") // } } + FileType.POS -> { //poNum, poDate, validTill, refQuoteNum, prodName, prodQuantity, totalAmount, products, vendorName, vendorGst, vendorAddress, tnc[]. docs[] - val PoMap : MutableMap = mutableMapOf() + val PoMap: MutableMap = mutableMapOf() sh.rowIterator().forEach { row -> - if(row == null) return@forEach + if (row == null) return@forEach val poNum = stringFromCellHelper(row.getCell(0)) val poDate = dateFromCellHelper(row.getCell(1)) val refQuoteNum = stringFromCellHelper(row.getCell(2)) @@ -332,11 +418,11 @@ fun ImportFromExcel(fileType: FileType, filePath : String) { val totalPoAmount = doubleFromCellHelper(row.getCell(9)) //tncs, docs - val prod = POProducts("", prodName, 0.0, prodQuantity,"") - if(PoMap.containsKey(poNum)){ + val prod = POProducts("", prodName, 0.0, prodQuantity, "") + if (PoMap.containsKey(poNum)) { //repeated row PoMap.get(poNum)?.products?.add(prod) - }else{ + } else { val vendor = Vendor() vendor.name = vendorName vendor.address = vendorAddress @@ -350,15 +436,16 @@ fun ImportFromExcel(fileType: FileType, filePath : String) { } } } + FileType.VENDORS -> { sh.rowIterator().forEach { row -> //name, msme, gstNum, addresss, rating, contacts - if(row == null) return@forEach + if (row == null) return@forEach val name = stringFromCellHelper(row.getCell(0)) val msme = stringFromCellHelper(row.getCell(1)) val gstNum = stringFromCellHelper(row.getCell(2)) val address = stringFromCellHelper(row.getCell(3)) - val rating = doubleFromCellHelper(row.getCell(4)) + val rating = doubleFromCellHelper(row.getCell(4)) //vendor object val vendor = Vendor() @@ -369,9 +456,10 @@ fun ImportFromExcel(fileType: FileType, filePath : String) { vendor.rating = rating } } + FileType.PRODS -> { sh.rowIterator().forEach { row -> - if(row == null) return@forEach + if (row == null) return@forEach //id, name, description, hsnCode, uom val prodId = longIntFromCellHelper(row.getCell(0)) val prodName = stringFromCellHelper(row.getCell(1)) @@ -385,7 +473,7 @@ fun ImportFromExcel(fileType: FileType, filePath : String) { prod.name = prodName prod.description = prodDesc prod.hsnCode = prodHsnCode - prod.uom = when(prodUom) { + prod.uom = when (prodUom) { "nos" -> UOM.NOS "ltr" -> UOM.LTR "mtr" -> UOM.MTR @@ -393,6 +481,7 @@ fun ImportFromExcel(fileType: FileType, filePath : String) { } } } + FileType.DOCS -> { sh.rowIterator().forEach { row -> //Document Name, Document Type, RefID, url @@ -405,7 +494,7 @@ fun ImportFromExcel(fileType: FileType, filePath : String) { //new doc object val doc = Document() doc.name = docName - doc.typeOfDoc = when(docType) { + doc.typeOfDoc = when (docType) { "quote" -> DocType.QUOTE "po" -> DocType.PO "invoice" -> DocType.INVOICE diff --git a/src/main/kotlin/com/restapi/controllers/Filters.kt b/src/main/kotlin/com/restapi/controllers/Filters.kt index 7745f7f..a329843 100644 --- a/src/main/kotlin/com/restapi/controllers/Filters.kt +++ b/src/main/kotlin/com/restapi/controllers/Filters.kt @@ -14,8 +14,8 @@ const val RATING_MIN = 0.0 //common filters would be used by most of the handlers //require a list of vendor ids to be passed data class CommonFilters( - val fromDate: LocalDate = baseDate, - val toDate: LocalDate = maxDate, + val from: LocalDate = baseDate, + val to: LocalDate = maxDate, val vendor: List? = null, val sortAsc: Boolean = true, val sortBy: String = IGNORE @@ -97,14 +97,14 @@ fun applyCommonFilters(q: io.ebean.ExpressionList, commonFilters: CommonF fun searchQuotes(commonFilters: CommonFilters, quoteFilters: QuoteFilters): List { val q = database.find(Quotation::class.java) .where() - .ge("quoteDate", commonFilters.fromDate) - .le("quoteDate", commonFilters.toDate) + .ge("quoteDate", commonFilters.from) + .le("quoteDate", commonFilters.to) .ge("validTill", quoteFilters.validAfter) .le("validTill", quoteFilters.validBefore) .ge("totalAmount", quoteFilters.totalAmountExceeds) .le("totalAmount", quoteFilters.totalAmountLessThan) .ilike("quoteNum", "%" + quoteFilters.quoteNumLike + "%") - applyFromToHelper(q, commonFilters.fromDate, commonFilters.toDate, "quoteDate") + applyFromToHelper(q, commonFilters.from, commonFilters.to, "quoteDate") applyVendorHelper(q, commonFilters.vendor) applySortHelper(q, commonFilters.sortBy, commonFilters.sortAsc) return q.findList() @@ -123,6 +123,18 @@ fun searchVendors(commonFilters: CommonFilters, vendorFilters: VendorFilters): L return q.findList() } +fun searchProducts(commonFilters: CommonFilters, productFilters: ProductFilters) : List { + val q = database.find(Product::class.java) + .where() + .ilike("name", "%" + productFilters.nameLike + "%") + .ilike("hsnCode", "%" + productFilters.hsnLike + "%") + + if(productFilters.uom != UOM.ALL){ + q.eq("uom", productFilters.uom) + } + applySortHelper(q, commonFilters.sortBy, commonFilters.sortAsc) + return q.findList() +} fun searchDocs(commonFilters: CommonFilters, documentFilters: DocumentFilters): List { val q = database.find(Document::class.java) .where() @@ -147,7 +159,7 @@ fun searchPos(commonFilters: CommonFilters, poFilters: POFilters?): List = mutableListOf() @@ -306,8 +325,16 @@ open class Product : BaseTenantModel() { @Entity open class Quotation : BaseTenantModel() { - fun patchValues(updatedQuote : Quotation) { - + fun patchValues(updatedQuote: Quotation) { + this.quoteDate = updatedQuote.quoteDate + this.vendorQuoteNum = updatedQuote.vendorQuoteNum + this.validTill = updatedQuote.validTill + this.reqForQuoteNum = updatedQuote.reqForQuoteNum + this.tnc = updatedQuote.tnc + this.products = updatedQuote.products + this.vendor = updatedQuote.vendor + this.documents = updatedQuote.documents + this.totalAmount = updatedQuote.totalAmount } @DbJsonB