Ignore:
Timestamp:
Jul 18, 2010, 8:27:35 AM (14 years ago)
Author:
Sam Habiel
Message:

Merged Changes from branch 1.2.1 to new version 1.3.
Changed version from 1.2 to 1.3.

Location:
Scheduling/trunk/cs/bsdx0200GUISourceCode
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • Scheduling/trunk/cs/bsdx0200GUISourceCode/AssemblyInfo.cs

    r804 r884  
    2828// by using the '*' as shown below:
    2929
    30 [assembly: AssemblyVersion("1.2.*")]
     30[assembly: AssemblyVersion("1.3.*")]
    3131
    3232//
     
    5858[assembly: AssemblyKeyFile("")]
    5959[assembly: AssemblyKeyName("")]
    60 [assembly: AssemblyFileVersionAttribute("1.2.0.0")]
     60[assembly: AssemblyFileVersionAttribute("1.3.0.0")]
    6161[assembly: ComVisibleAttribute(false)]
  • Scheduling/trunk/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj

    r869 r884  
    9797    <NoWarn>
    9898    </NoWarn>
    99     <Optimize>true</Optimize>
     99    <Optimize>false</Optimize>
    100100    <RegisterForComInterop>false</RegisterForComInterop>
    101101    <RemoveIntegerChecks>false</RemoveIntegerChecks>
     
    429429  </ItemGroup>
    430430  <ItemGroup>
    431     <ProjectReference Include="..\..\..\bmx_rep\BMX2\BMXNet\BMXNet.csproj">
     431    <ProjectReference Include="..\..\..\BMX\bmx_0200scr\BMX2\BMXNet\BMXNet.csproj">
    432432      <Project>{DE8E4CC9-4F3A-4E32-8DFE-EE5692E8FC45}</Project>
    433433      <Name>BMXNet</Name>
  • Scheduling/trunk/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj.user

    r869 r884  
    3636    </RemoteDebugMachine>
    3737    <StartAction>Project</StartAction>
    38     <StartArguments>/s=192.168.254.129 /p=9260 /a=shabiel12 /v=catdog.55 /e=windows-1256</StartArguments>
     38    <StartArguments>/s=172.16.17.51 /p=9240 /a=shabiel12 /v=catdog.44 /e=windows-1256</StartArguments>
    3939    <StartPage>
    4040    </StartPage>
     
    5555    </RemoteDebugMachine>
    5656    <StartAction>Project</StartAction>
    57     <StartArguments>/s=192.168.254.129 /p=9260 /a=shabiel12 /v=catdog.55 /e=windows-1256</StartArguments>
     57    <StartArguments>/s=172.16.17.51 /p=9240 /a=shabiel12 /v=catdog.44 /e=windows-1256</StartArguments>
    5858    <StartPage>
    5959    </StartPage>
  • Scheduling/trunk/cs/bsdx0200GUISourceCode/ClinicalScheduling.sln

    r864 r884  
    44Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClinicalScheduling", "ClinicalScheduling.csproj", "{8C05C4F7-FE81-479F-87A0-44E04C7F6E0F}"
    55EndProject
    6 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BMXNet", "..\..\..\bmx_rep\BMX2\BMXNet\BMXNet.csproj", "{DE8E4CC9-4F3A-4E32-8DFE-EE5692E8FC45}"
     6Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BMXNet", "..\..\..\BMX\bmx_0200scr\BMX2\BMXNet\BMXNet.csproj", "{DE8E4CC9-4F3A-4E32-8DFE-EE5692E8FC45}"
    77EndProject
    88Global
  • Scheduling/trunk/cs/bsdx0200GUISourceCode/DPatientLetter.cs

    r850 r884  
    317317                _currentApptPrinting = 0;
    318318                e.HasMorePages = true;
    319             }           
     319                return;
     320            }
     321
     322            // if neither of these conditions is true, then we are done with printing.
     323            // So reset counters for next one. Fixes ticket #15 on https://trac.opensourcevista.net/ticket/15
     324            _currentResourcePrinting = 0;
     325            _currentApptPrinting = 0;
     326            _pageNumber = 0;
    320327        }
    321328
     
    336343                _currentApptPrinting++;
    337344                if (_currentApptPrinting < _dsApptDisplay.PatientAppts.Count)
     345                {
    338346                    e.HasMorePages = true;
    339             }
     347                    return;
     348                }
     349            }
     350
     351            // If we reach this point, we need to reset the counter (ticket #15 on https://trac.opensourcevista.net/ticket/15)
     352                _currentApptPrinting = 0;
    340353           
    341354        }
     
    357370                _currentApptPrinting++;
    358371                if (_currentApptPrinting < _dsRebookAppts.PatientAppts.Count)
     372                {
    359373                    e.HasMorePages = true;
    360             }
    361 
     374                    return;
     375                }
     376            }
     377            // If we reach this point, we need to reset the counter (ticket #15 on https://trac.opensourcevista.net/ticket/15)
     378            _currentApptPrinting = 0;
    362379        }
    363380
     
    379396                _currentApptPrinting++;
    380397                if (_currentApptPrinting < _dsRebookAppts.PatientAppts.Count)
     398                {
    381399                    e.HasMorePages = true;
    382             }
     400                    return;
     401                }
     402            }
     403            // If we reach this point, we need to reset the counter (ticket #15 on https://trac.opensourcevista.net/ticket/15)
     404            _currentApptPrinting = 0;
    383405        }
    384406        }
Note: See TracChangeset for help on using the changeset viewer.