- Timestamp:
- May 8, 2015, 7:52:55 AM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
cprs/branches/HealthSevak-CPRS/CPRS-Chart/Orders/fOrdersRenew.pas
r829 r1693 262 262 FixHeaderControlDelphi2006Bug(hdrOrders); 263 263 OKPressed := False; 264 hdrOrders.Sections[0].Width := Round(self.width * 0.75); 265 hdrOrders.Sections[1].Width := Round(self.width * 0.25); 264 266 ResizeFormToFont(Self); 265 SetFormPosition(Self); 267 SetFormPosition(Self); 266 268 end; 267 269 … … 410 412 var 411 413 ARect: TRect; 412 begin 414 cnt: integer; 415 x: string; 416 begin 417 cnt := 0; 413 418 ARect.Left := 0; 414 419 ARect.Top := 0; … … 416 421 ARect.Right := hdrOrders.Sections[Column].Width -6; 417 422 Result := WrappedTextHeightByFont(lstOrders.Canvas,lstOrders.Font,TheOrderText,ARect); 423 //AGP 28.0 this fix address the issue of WrappedTextHeightByFont appearing to not take in account CRLF 424 if Pos(CRLF, TheOrderText) > 0 then 425 begin 426 repeat 427 x := Copy(TheOrderText, 1, Pos(CRLF, TheOrderText) - 1); 428 if Length(x) = 0 then x := TheOrderText; 429 Delete(TheOrderText, 1, Length(x) + 2); {delete text + CRLF} 430 cnt := cnt + 1; 431 until TheOrderText = ''; 432 if cnt > 0 then Result := Result + (cnt * Abs(self.Font.Height)); 433 if Result > 255 then Result := 255; 434 end; 435 418 436 end; 419 437 … … 423 441 OIInfo,FillerID: string; 424 442 AnOIList: TStringList; 443 subI: integer; 425 444 begin 426 445 AnOIList := TStringList.Create; 427 446 OIInfo := DataForOrderCheck(AnOrderID); 428 447 FillerID := Piece(OIInfo,'^',2); 429 AnOIList.Add(OIInfo); 430 OrderChecksOnAccept(OCList, FillerID, '', AnOIList, AnOrderID); 448 subI := 1; 449 while Length(Piece(OIInfo,'|',subI))>1 do 450 begin 451 AnOIList.Add(Piece(OIInfo,'|',subI)); 452 subI := subI + 1; 453 end; 454 OrderChecksOnAccept(OCList, FillerID, '', AnOIList, AnOrderID,'1'); 431 455 Result := AcceptOrderWithChecks(OCList); 432 456 end;
Note:
See TracChangeset
for help on using the changeset viewer.